Bug#769880: unblock: hello/2.9-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
I'd like to ask the unblocking of "hello".
It fixes #767172 which is some kind of brown-paper bug (one of the
star features of "hello" is that it says "hello" according to LANG,
which was not the case).
I would have liked to include the copyright file contributed by Osamu Aoki,
but unfortunately didn't find the time to review it appropriately, so
this is deferred for "stretch".
debdiff follows, excluding the config.guess/config.sub part.
Thanks.
diff -Nru --exclude '*99-config-guess-config-sub' hello-2.9/debian/changelog hello-2.9/debian/changelog
--- hello-2.9/debian/changelog 2014-04-12 15:23:34.000000000 +0200
+++ hello-2.9/debian/changelog 2014-11-06 12:04:53.000000000 +0100
@@ -1,3 +1,17 @@
+hello (2.9-2) unstable; urgency=low
+
+ * Apply patch from Reuben Thomas to fix i18n of default message.
+ This is upstream commit c4aed00. Closes: #767172.
+ * The previous change in src/hello.c trigger a rebuild of man/hello.1
+ that we don't need. Add a "touch man/hello.1" to avoid it.
+ * Use Breaks: hello-debhelper (<< 2.9), not Conflicts,
+ as hello-debhelper is deprecated.
+ * Restore simple watch file from old hello package that was lost
+ when the packages were renamed.
+ * Update 99-config-guess-config-sub patch.
+
+ -- Santiago Vila <sanvila@debian.org> Thu, 06 Nov 2014 12:03:40 +0100
+
hello (2.9-1) unstable; urgency=low
* New upstream release. Closes: #744195.
diff -Nru --exclude '*99-config-guess-config-sub' hello-2.9/debian/control hello-2.9/debian/control
--- hello-2.9/debian/control 2014-04-12 15:00:00.000000000 +0200
+++ hello-2.9/debian/control 2014-11-06 12:00:00.000000000 +0100
@@ -9,8 +9,9 @@
Package: hello
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: hello-traditional, hello-debhelper (<< 2.9)
+Conflicts: hello-traditional
Replaces: hello-traditional, hello-debhelper (<< 2.9)
+Breaks: hello-debhelper (<< 2.9)
Description: example package based on GNU hello
The GNU hello program produces a familiar, friendly greeting. It
allows non-programmers to use a classic computer science tool which
diff -Nru --exclude '*99-config-guess-config-sub' hello-2.9/debian/patches/01-fix-i18n-of-default-message hello-2.9/debian/patches/01-fix-i18n-of-default-message
--- hello-2.9/debian/patches/01-fix-i18n-of-default-message 1970-01-01 01:00:00.000000000 +0100
+++ hello-2.9/debian/patches/01-fix-i18n-of-default-message 2014-11-06 12:01:00.000000000 +0100
@@ -0,0 +1,34 @@
+From: Reuben Thomas <rrt@sc3d.org>
+Subject: Fix i18n of default message: don't initialise it before we set up gettext
+Bug-Debian: http://bugs.debian.org/767172
+
+--- a/src/hello.c
++++ b/src/hello.c
+@@ -1,7 +1,7 @@
+ /* hello.c -- print a greeting message and exit.
+
+ Copyright 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005,
+- 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
++ 2006, 2007, 2008, 2010, 2011, 2013 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -47,7 +47,7 @@
+ {
+ int optc;
+ int lose = 0;
+- const char *greeting_msg = _("Hello, world!");
++ const char *greeting_msg;
+ wchar_t *mb_greeting;
+ size_t len;
+ greeting_type g = greet_traditional;
+@@ -63,6 +63,9 @@
+ textdomain (PACKAGE);
+ #endif
+
++ /* Having initialized gettext, get the default message. */
++ greeting_msg = _("Hello, world!");
++
+ /* Even exiting has subtleties. On exit, if any writes failed, change
+ the exit status. The /dev/full device on GNU/Linux can be used for
+ testing; for instance, hello >/dev/full should exit unsuccessfully.
diff -Nru --exclude '*99-config-guess-config-sub' hello-2.9/debian/patches/series hello-2.9/debian/patches/series
--- hello-2.9/debian/patches/series 2014-04-12 15:00:00.000000000 +0200
+++ hello-2.9/debian/patches/series 2014-11-06 12:00:00.000000000 +0100
@@ -1 +1,2 @@
+01-fix-i18n-of-default-message
99-config-guess-config-sub
diff -Nru --exclude '*99-config-guess-config-sub' hello-2.9/debian/rules hello-2.9/debian/rules
--- hello-2.9/debian/rules 2014-04-12 15:00:00.000000000 +0200
+++ hello-2.9/debian/rules 2014-11-06 12:00:00.000000000 +0100
@@ -2,6 +2,10 @@
%:
dh $@
+override_dh_auto_build:
+ touch man/hello.1
+ dh_auto_build
+
override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) distclean
diff -Nru --exclude '*99-config-guess-config-sub' hello-2.9/debian/watch hello-2.9/debian/watch
--- hello-2.9/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ hello-2.9/debian/watch 2014-11-06 12:00:00.000000000 +0100
@@ -0,0 +1,9 @@
+# debian/watch
+# Debian uscan file for hello package
+# Manpage: uscan(1)
+
+# Compulsory line, format version of this file
+version=3
+
+# Current version from GNU site
+http://ftp.gnu.org/gnu/hello/hello-(.*).tar.gz
Reply to: