projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Debian version 3.0.29-2
[privoxy.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
aeedd3b
..
e7745b0
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-1,6
+1,6
@@
#!/usr/bin/make -f
#
#!/usr/bin/make -f
#
-# (c) 2002-20
18
Roland Rosenfeld <roland@debian.org>
+# (c) 2002-20
21
Roland Rosenfeld <roland@debian.org>
#
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
#
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@
-23,6
+23,10
@@
override_dh_auto_configure:
--enable-zlib \
--enable-no-gifs \
--enable-external-filters \
--enable-zlib \
--enable-no-gifs \
--enable-external-filters \
+ --enable-extended-statistics \
+ --enable-pcre-host-patterns \
+ --with-mbedtls \
+ --with-brotli \
--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
override_dh_auto_build:
--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
override_dh_auto_build:
@@
-32,6
+36,7
@@
override_dh_auto_build:
env -u LANG LC_ALL=C.UTF-8 $(MAKE) dok
rm -f doc/webserver/user-manual/*.bak
env -u LANG LC_ALL=C.UTF-8 $(MAKE) man
env -u LANG LC_ALL=C.UTF-8 $(MAKE) dok
rm -f doc/webserver/user-manual/*.bak
env -u LANG LC_ALL=C.UTF-8 $(MAKE) man
+ env -u LANG LC_ALL=C.UTF-8 $(MAKE) man2html
override_dh_auto_clean:
# restore auto build documentation from source package:
override_dh_auto_clean:
# restore auto build documentation from source package:
@@
-51,8
+56,7
@@
override_dh_auto_clean:
override_dh_auto_install:
install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
override_dh_auto_install:
install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
- sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' \
- -e 's/\$$Id: config,v.*/Id: config,v/' < config \
+ sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' < config \
> $(DEBDIR)/usr/share/privoxy/config
install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
install -m 0644 match-all.action $(DEBDIR)/etc/privoxy/match-all.action
> $(DEBDIR)/usr/share/privoxy/config
install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
install -m 0644 match-all.action $(DEBDIR)/etc/privoxy/match-all.action
@@
-75,21
+79,23
@@
override_dh_auto_install:
cp -r templates $(DEBDIR)/etc/privoxy/
rm -f $(DEBDIR)/etc/privoxy/templates/*~
cp -r templates $(DEBDIR)/etc/privoxy/
rm -f $(DEBDIR)/etc/privoxy/templates/*~
- rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
-# Remove
CVS tags and
trailing spaces from config files:
+# Remove trailing spaces from config files:
find $(DEBDIR)/etc/privoxy -type f \
find $(DEBDIR)/etc/privoxy -type f \
- | xargs grep -l '
\$$[A-Z][^$$]*:[^$$]*\
$$' \
+ | xargs grep -l '
$$' \
| while read f; do \
| while read f; do \
- sed -e 's/\$$\(Id: [^$$]*,v\)[^$$]*\$$/\1/' \
- -e 's/\$$\(Source: [^$$]*\)\$$/\1/' \
- -e 's/\$$\(Log: [^$$]*\)\$$/\1/' \
- -e 's/ *$$//' < $$f > $$f.new; \
+ sed -e 's/ *$$//' < $$f > $$f.new; \
mv -f $$f.new $$f; \
done
mv -f $$f.new $$f; \
done
+override_dh_install:
+ dh_install
+ install -m0644 debian/apparmor/usr.sbin.privoxy \
+ $(DEBDIR)/etc/apparmor.d/
+ dh_apparmor --profile-name=usr.sbin.privoxy
+
override_dh_installdocs:
override_dh_installdocs:
- dh_installdocs
-XCVS
+ dh_installdocs
(cd $(DEBDIR)/usr/share/doc/privoxy/; \
mv privoxy-index.html index.html)
(cd $(DEBDIR)/usr/share/doc/privoxy/user-manual; ln -s '../p_doc.css')
(cd $(DEBDIR)/usr/share/doc/privoxy/; \
mv privoxy-index.html index.html)
(cd $(DEBDIR)/usr/share/doc/privoxy/user-manual; ln -s '../p_doc.css')