tags 688194 + patch tags 688194 + pending thanks Dear maintainer,
I've prepared an NMU for prewikka (versioned as 1.0.0-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Paul Mc Cartney: Blue Moon Of Kentucky
diff -u prewikka-1.0.0/debian/prewikka.postinst prewikka-1.0.0/debian/prewikka.postinst
--- prewikka-1.0.0/debian/prewikka.postinst
+++ prewikka-1.0.0/debian/prewikka.postinst
@@ -46,7 +46,7 @@
dbc_dbserver=localhost
fi
- install -m 0640 /usr/share/doc/prewikka/examples/prewikka.conf $CONF_NEW
+ install -m 0640 /usr/share/prewikka/etc/prewikka/prewikka.conf $CONF_NEW
# do the following only if user has choosen dbconfig to manage database
if [ -n "$dbc_dbtype" ]; then
@@ -55,7 +55,7 @@
sed -i "/\[database\]/{n;s/type: .*$/type: $dbc_dbtype/;n;n;s/user: .*$/user: $dbc_dbuser/;n;s/pass: .*$/pass: $dbc_dbpass/;n;s/name: .*$/name: $dbc_dbname/;}" $CONF_NEW
fi
- if diff -q /usr/share/doc/prewikka/examples/prewikka.conf ${CONF} >/dev/null 2>&1; then
+ if diff -q /usr/share/prewikka/etc/prewikka/prewikka.conf ${CONF} >/dev/null 2>&1; then
# prewikka configure file has not been changed .. overwrite it
install -m 0640 $CONF_NEW $CONF
else
diff -u prewikka-1.0.0/debian/changelog prewikka-1.0.0/debian/changelog
--- prewikka-1.0.0/debian/changelog
+++ prewikka-1.0.0/debian/changelog
@@ -1,3 +1,18 @@
+prewikka (1.0.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "modifies conffiles (policy 10.7.3): /etc/prewikka/prewikka.conf":
+ - debian/rules: don't install configuration file to /etc; ship it
+ under /usr/share/prewikka
+ - change handling of configuration file in postinst to use the
+ configuration template in /usr/share/prewikka instead of the one
+ installed as an example (Policy 12.3.: "Packages must not require the
+ existence of any files in `/usr/share/doc/'")
+ - don't install the example anymore but make it a symlink
+ (Closes: #688194)
+
+ -- gregor herrmann <gre...@debian.org> Sun, 30 Sep 2012 20:20:33 +0200
+
prewikka (1.0.0-1.1) unstable; urgency=high
* Non-maintainer upload by the Security Team.
diff -u prewikka-1.0.0/debian/rules prewikka-1.0.0/debian/rules
--- prewikka-1.0.0/debian/rules
+++ prewikka-1.0.0/debian/rules
@@ -39,8 +39,7 @@
python setup.py install --root=$(CURDIR)/debian/prewikka --prefix=/usr
- mv $(CURDIR)/debian/prewikka/usr/etc/* $(CURDIR)/debian/prewikka/etc/
- rmdir $(CURDIR)/debian/prewikka/usr/etc
+ mv $(CURDIR)/debian/prewikka/usr/etc $(CURDIR)/debian/prewikka/usr/share/prewikka
find debian/prewikka -name siteconfig.py -exec sed -i 's|/usr/etc|/etc|' {} \;
cp database/mysql.sql debian/prewikka/usr/share/dbconfig-common/data/prewikka/install/mysql
cp database/pgsql.sql debian/prewikka/usr/share/dbconfig-common/data/prewikka/install/pgsql
@@ -57,7 +56,7 @@
dh_testroot
dh_installchangelogs
dh_installdocs
- dh_installexamples conf/prewikka.conf
+ dh_link usr/share/prewikka/etc/prewikka/prewikka.conf usr/share/doc/prewikka/examples/prewikka.conf
# make python scripts executable
for i in `find debian -mindepth 3 -type f`; do \
case $$i in \
signature.asc
Description: Digital signature
