Control: tags 771500 + patch
Control: tags 771500 + pending

Dear maintainer,

I've prepared an NMU for darcsweb (versioned as 1.1-3.2) and
uploaded it to DELAYED/5. 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: Cássia Eller: De Esquina
diff -Nru darcsweb-1.1/debian/changelog darcsweb-1.1/debian/changelog
--- darcsweb-1.1/debian/changelog	2011-02-26 08:42:53.000000000 +0100
+++ darcsweb-1.1/debian/changelog	2014-12-07 17:40:11.000000000 +0100
@@ -1,3 +1,16 @@
+darcsweb (1.1-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "postinst uses /usr/share/doc content (Policy 12.3):
+    /usr/share/doc/darcsweb/examples/darcsweb.conf":
+    - install darcsweb.conf into /usr/share/darcsweb
+    - use this location in the postinst
+    - additionall create a symlink in /usr/share/doc/darcsweb/examples
+    Thanks to Andreas Beckmann for the bug report.
+    (Closes: #771500)
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 07 Dec 2014 17:39:05 +0100
+
 darcsweb (1.1-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru darcsweb-1.1/debian/postinst darcsweb-1.1/debian/postinst
--- darcsweb-1.1/debian/postinst	2010-11-21 13:43:35.000000000 +0100
+++ darcsweb-1.1/debian/postinst	2014-12-07 17:26:28.000000000 +0100
@@ -51,13 +51,13 @@
 	for server in $webservers; do
 		if [ -d "/etc/${server}/conf.d" ]; then
 			if [ ! -e "/etc/${server}/conf.d/darcsweb.conf" ] ; then
-				install /usr/share/doc/darcsweb/examples/darcsweb.conf \
+				install /usr/share/darcsweb/darcsweb.conf \
 					/etc/${server}/conf.d/darcsweb.conf
 			fi
 		else
 			install -d /etc/${server}/conf.d
 			if [ ! -e "/etc/${server}/conf.d/darcsweb.conf" ] ; then
-				install /usr/share/doc/darcsweb/examples/darcsweb.conf \
+				install /usr/share/darcsweb/darcsweb.conf \
 					/etc/${server}/conf.d/darcsweb.conf
 			fi
 		fi
diff -Nru darcsweb-1.1/debian/rules darcsweb-1.1/debian/rules
--- darcsweb-1.1/debian/rules	2010-11-21 13:43:35.000000000 +0100
+++ darcsweb-1.1/debian/rules	2014-12-07 17:28:10.000000000 +0100
@@ -23,6 +23,7 @@
 	dh_install darcs.png minidarcs.png style.css usr/share/darcsweb
 	chmod 0755 darcsweb.cgi
 	dh_install darcsweb.cgi usr/lib/cgi-bin
+	dh_install debian/conf/darcsweb.conf usr/share/darcsweb
 	dh_installdebconf
 
 # Build architecture-independent files here.
@@ -31,8 +32,8 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installexamples debian/conf/darcsweb.conf 
 	dh_installman
+	dh_link usr/share/darcsweb/darcsweb.conf usr/share/doc/darcsweb/examples/darcsweb.conf
 	dh_compress
 	dh_fixperms
 	dh_installdeb

Attachment: signature.asc
Description: Digital Signature

Reply via email to