[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#776675: marked as done (unblock libdumbnet/1.12-6)

Your message dated Fri, 06 Feb 2015 22:32:11 +0100
with message-id <54D532DB.3050406@thykier.net>
and subject line Re: Bug#776675: unblock: libdumbnet/1.12-6
has caused the Debian Bug report #776675,
regarding unblock libdumbnet/1.12-6
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
776675: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776675
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package libdumbnet

Just did a QA upload fixing #775896 - I've reverted the descision to
make /usr/share/doc/libdumnet-dev a symlink. Diff attached.

unblock libdumbnet/1.12-5


thanks,

bernd

-- 
 Bernd Zeimetz                            Debian GNU/Linux Developer
 http://bzed.de                                http://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F

diff -u libdumbnet-1.12/debian/rules libdumbnet-1.12/debian/rules
--- libdumbnet-1.12/debian/rules
+++ libdumbnet-1.12/debian/rules
@@ -58,7 +58,7 @@
 	dh_testroot
 	$(MAKE) DESTDIR=$$(pwd)/debian/libdumbnet1 install
 	mkdir -p debian/libdumbnet-dev/usr/lib \
-	         debian/libdumbnet-dev/usr/share/doc \
+	         debian/libdumbnet-dev/usr/share/doc/libdumbnet-dev \
 	         debian/libdumbnet-dev/usr/share/man/man1
 	mkdir -p debian/python-dumbnet/usr/lib
 	mv debian/libdumbnet1/usr/include \
@@ -74,10 +74,11 @@
 	    debian/python-dumbnet/usr/lib
 	cp debian/dumbnet-config.1 debian/libdumbnet-dev/usr/share/man/man1/
 	ln -s dumbnet-config.1 debian/libdumbnet-dev/usr/share/man/man1/dnet-config.1
-	ln -s libdumbnet1 debian/libdumbnet-dev/usr/share/doc/libdumbnet-dev
+	ln -s ../libdumbnet1 debian/libdumbnet-dev/usr/share/doc/libdumbnet-dev/docs
 	ln -s dumbnet-config debian/libdumbnet-dev/usr/bin/dnet-config
 	dh_installchangelogs
-	dh_installdocs TODO README
+	dh_installdocs -plibdumbnet1 TODO README
+	dh_installdocs -Nlibdumbnet1
 	dh_python2 -ppython-dumbnet
 	for E in debian/python-dumbnet/usr/lib/python*; do \
 	  rm -f $$E/site-packages/*egg-info; \
diff -u libdumbnet-1.12/debian/changelog libdumbnet-1.12/debian/changelog
--- libdumbnet-1.12/debian/changelog
+++ libdumbnet-1.12/debian/changelog
@@ -1,3 +1,11 @@
+libdumbnet (1.12-5) unstable; urgency=medium
+
+  * QA upload.
+  * Fix missing doc folder during upgrades
+    (Closes: #775896)
+
+ -- Bernd Zeimetz <bzed@debian.org>  Fri, 30 Jan 2015 22:53:35 +0100
+
 libdumbnet (1.12-4) unstable; urgency=low
 
   * QA upload.
only in patch2:
unchanged:
--- libdumbnet-1.12.orig/debian/preinst
+++ libdumbnet-1.12/debian/preinst
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    install|upgrade)
+        # dpkg does not replace directories by symlinks or vice versa.
+        if [ -L /usr/share/doc/libdumbnet-dev ]; then
+                rm -f /usr/share/doc/libdumbnet-dev
+        fi
+    ;;
+    abort-upgrade)
+    ;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

--- End Message ---
--- Begin Message --- 
On 2015-02-06 20:59, Bernd Zeimetz wrote:
> reopen 776675
> retitle 776675 unblock libdumbnet/1.12-6
> thanks
> 
> 
> Hi,
> 
> unfortunately...
> 
>>> Just did a QA upload fixing #775896 - I've reverted the descision to
>>> make /usr/share/doc/libdumnet-dev a symlink. Diff attached.
>>>
>>>
> 
> 
> i did not expect people to test upgrades from testing to unstable and I failed
> to migrate the broken symlink back to a directory properly.
> So unfortunately we need a new unblock:
> 
> unblock libdumbnet/1.12-6
> 
> New diff from -5 to -6 is attached.
> 
> thanks,
> 
> Bernd
> 
> 
> 

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: