Re: Bug#689154: unblock: gnunet/0.9.3-3wheezy1
Dear release team,
I prepared a new revision on gnunet and uploaded it to mentors.
You'll find attached the full debdiff to the last unblocked revision
(0.9.3-3). Here is the detail of the changes, with the answers to Julien:
Le 25/11/2012 20:17, Julien Cristau a écrit :
>> + * Revert the use dh_installdocs --link-doc (Closes: #687875, #687881,
>> + #687883).
>
> Are the AUTHORS/README changes in various debian/*.docs files related?
Yes they are, I need them back since they are not symlinked any more.
>> + * Allways install libnss to /lib and fix FTBFS on ia64 (Closes: #688590).
>> + * Install libnss to /lib, really fix #688590, thanks to Christian Grothoff.
>
> That one's rather bigger than strictly necessary…
I updated it to minimal changes.
>> + [ David Prévot ]
>> + * debian/po/fr.po: Fix charset, and use non-breaking spaces.
I kept this one since I am not the author and it seems quite simple to
review.
>> +
> Cheers,
> Julien
Since gnunet/0.9.3-4 was uploaded to unstable with too many changes for
wheezy, I targeted wheezy directly in the changelog (not really sure it
shouldn't be testing-proposed-updates) and the revision is now called
gnunet/0.9.3-3wheezy1.
How does it works now to get it to wheezy directly ?
Cheers,
Bertrand
diff -Nru gnunet-0.9.3/debian/changelog gnunet-0.9.3/debian/changelog
--- gnunet-0.9.3/debian/changelog 2012-12-09 11:35:52.000000000 +0100
+++ gnunet-0.9.3/debian/changelog 2012-12-09 11:10:40.000000000 +0100
@@ -1,3 +1,15 @@
+gnunet (0.9.3-3wheezy1) wheezy; urgency=low
+
+ [ Bertrand Marc ]
+ * Revert the use dh_installdocs --link-doc (Closes: #687875, #687881,
+ #687883).
+ * Install libnss to /lib, really fix #688590, thanks to Christian Grothoff.
+
+ [ David Prévot ]
+ * debian/po/fr.po: Fix charset, and use non-breaking spaces.
+
+ -- Bertrand Marc <beberking@gmail.com> Mon, 03 Dec 2012 09:12:51 +0100
+
gnunet (0.9.3-3) unstable; urgency=low
* debian/control: update Vcs-* to the new repository in collab-maint.
diff -Nru gnunet-0.9.3/debian/gnunet-client.docs gnunet-0.9.3/debian/gnunet-client.docs
--- gnunet-0.9.3/debian/gnunet-client.docs 1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-client.docs 2012-12-02 20:02:03.000000000 +0100
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru gnunet-0.9.3/debian/gnunet-dev.docs gnunet-0.9.3/debian/gnunet-dev.docs
--- gnunet-0.9.3/debian/gnunet-dev.docs 1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-dev.docs 2012-12-02 20:02:03.000000000 +0100
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru gnunet-0.9.3/debian/gnunet.docs gnunet-0.9.3/debian/gnunet.docs
--- gnunet-0.9.3/debian/gnunet.docs 1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet.docs 2012-12-02 20:02:03.000000000 +0100
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru gnunet-0.9.3/debian/gnunet-server.docs gnunet-0.9.3/debian/gnunet-server.docs
--- gnunet-0.9.3/debian/gnunet-server.docs 2012-12-09 11:35:52.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-server.docs 2012-12-02 20:02:03.000000000 +0100
@@ -1,2 +1,4 @@
+AUTHORS
+README
doc/README.mysql
doc/README.postgres
diff -Nru gnunet-0.9.3/debian/gnunet-server.install gnunet-0.9.3/debian/gnunet-server.install
--- gnunet-0.9.3/debian/gnunet-server.install 2012-12-09 11:35:52.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-server.install 2012-12-09 10:58:48.000000000 +0100
@@ -41,9 +41,9 @@
usr/lib/libgnunettransporttesting.so.*
usr/lib/libgnunettun.so.*
usr/lib/libgnunetvpn.so.*
-usr/lib/libnss_gns.so.2
-usr/lib/libnss_gns4.so.2
-usr/lib/libnss_gns6.so.2
+lib/libnss_gns.so.2
+lib/libnss_gns4.so.2
+lib/libnss_gns6.so.2
usr/lib/gnunet/*.so
usr/share/gnunet/config.d
usr/share/gnunet/hellos/*
diff -Nru gnunet-0.9.3/debian/patches/configure_libnss.diff gnunet-0.9.3/debian/patches/configure_libnss.diff
--- gnunet-0.9.3/debian/patches/configure_libnss.diff 1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/patches/configure_libnss.diff 2012-12-09 11:11:31.000000000 +0100
@@ -0,0 +1,14 @@
+--- a/src/gns/nss/Makefile.am
++++ b/src/gns/nss/Makefile.am
+@@ -21,11 +21,7 @@
+
+ AM_LDFLAGS=-avoid-version -module -export-dynamic
+
+-if HAVE_SUDO
+ nssdir = /lib/
+-else
+-nssdir = $(libdir)
+-endif
+
+ LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
+
diff -Nru gnunet-0.9.3/debian/patches/series gnunet-0.9.3/debian/patches/series
--- gnunet-0.9.3/debian/patches/series 2012-12-09 11:35:52.000000000 +0100
+++ gnunet-0.9.3/debian/patches/series 2012-12-09 11:06:53.000000000 +0100
@@ -1,2 +1,3 @@
+configure_libnss.diff
support_GNU_hurd.patch
sparc_alignment.patch
diff -Nru gnunet-0.9.3/debian/po/fr.po gnunet-0.9.3/debian/po/fr.po
--- gnunet-0.9.3/debian/po/fr.po 2012-12-09 11:35:52.000000000 +0100
+++ gnunet-0.9.3/debian/po/fr.po 2012-12-09 11:10:40.000000000 +0100
@@ -13,7 +13,7 @@
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
@@ -21,7 +21,7 @@
#. Description
#: ../gnunet-server.templates:1001
msgid "GNUnet user:"
-msgstr "Utilisateur GNUnet :"
+msgstr "Utilisateur GNUnet :"
#. Type: string
#. Description
@@ -39,13 +39,13 @@
"already exist, it will automatically be created, with no login shell."
msgstr ""
"Il est conseillé d'utiliser un identifiant dédié. S'il n'existe pas, il "
-"sera créé sans connexion interactive possible (pas de « shell »)."
+"sera créé sans connexion interactive possible (pas de « shell »)."
#. Type: string
#. Description
#: ../gnunet-server.templates:2001
msgid "GNUnet group:"
-msgstr "Groupe de GNUnet :"
+msgstr "Groupe de GNUnet :"
#. Type: string
#. Description
@@ -71,7 +71,7 @@
#. Description
#: ../gnunet-server.templates:3001
msgid "Should the GNUnet server be launched on boot?"
-msgstr "Faut-il lancer le démon GNUnet au démarrage du système ?"
+msgstr "Faut-il lancer le démon GNUnet au démarrage du système ?"
#. Type: boolean
#. Description
diff -Nru gnunet-0.9.3/debian/rules gnunet-0.9.3/debian/rules
--- gnunet-0.9.3/debian/rules 2012-12-09 11:35:52.000000000 +0100
+++ gnunet-0.9.3/debian/rules 2012-12-09 11:08:08.000000000 +0100
@@ -27,6 +27,7 @@
# Removing useless files
rm -f debian/tmp/usr/lib/*.la debian/tmp/usr/lib/gnunet/*.la \
+ debian/tmp/lib/*.la \
debian/tmp/usr/share/doc/gnunet/COPYING \
debian/tmp/usr/bin/gnunet-service-template \
debian/tmp/usr/bin/gnunet-template \
@@ -35,9 +36,6 @@
override_dh_install:
dh_install -a --fail-missing
-override_dh_installdocs:
- dh_installdocs --link-doc=gnunet-common
-
override_dh_strip:
dh_strip --dbg-package=gnunet-dbg
Reply to: