Bug#769881: unblock: hello-traditional/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-traditional" as well, which
is the twin brother of "hello" not using debhelper.
It fixes the same brown paper bug fixed in "hello". debdiff follows,
excluding config.guess/config.sub, this dediff is mostly a subset of
the one for "hello".
Thanks.
diff -Nru --exclude '*99-config-guess-config-sub' hello-traditional-2.9/debian/changelog hello-traditional-2.9/debian/changelog
--- hello-traditional-2.9/debian/changelog 2014-04-12 15:07:49.000000000 +0200
+++ hello-traditional-2.9/debian/changelog 2014-11-07 20:20:39.000000000 +0100
@@ -1,3 +1,15 @@
+hello-traditional (2.9-2) unstable; urgency=low
+
+ * Apply patch from Reuben Thomas to fix i18n of default message.
+ This is upstream commit c4aed00. Reported as #767172 against hello.
+ * 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.
+ * Update 99-config-guess-config-sub patch.
+
+ -- Santiago Vila <sanvila@debian.org> Fri, 07 Nov 2014 20:20:32 +0100
+
hello-traditional (2.9-1) unstable; urgency=low
* New upstream release.
diff -Nru --exclude '*99-config-guess-config-sub' hello-traditional-2.9/debian/control hello-traditional-2.9/debian/control
--- hello-traditional-2.9/debian/control 2014-04-12 15:00:00.000000000 +0200
+++ hello-traditional-2.9/debian/control 2014-11-07 12:00:00.000000000 +0100
@@ -9,8 +9,9 @@
Architecture: any
Depends: ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info
Provides: hello
-Conflicts: hello, hello-debhelper (<< 2.9)
+Conflicts: hello
Replaces: hello, hello-debhelper (<< 2.9)
+Breaks: hello-debhelper (<< 2.9)
Description: example package not using any helper package
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-traditional-2.9/debian/patches/01-fix-i18n-of-default-message hello-traditional-2.9/debian/patches/01-fix-i18n-of-default-message
--- hello-traditional-2.9/debian/patches/01-fix-i18n-of-default-message 1970-01-01 01:00:00.000000000 +0100
+++ hello-traditional-2.9/debian/patches/01-fix-i18n-of-default-message 2014-11-07 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-traditional-2.9/debian/patches/series hello-traditional-2.9/debian/patches/series
--- hello-traditional-2.9/debian/patches/series 2014-04-12 15:00:00.000000000 +0200
+++ hello-traditional-2.9/debian/patches/series 2014-11-07 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-traditional-2.9/debian/rules hello-traditional-2.9/debian/rules
--- hello-traditional-2.9/debian/rules 2014-04-12 15:00:00.000000000 +0200
+++ hello-traditional-2.9/debian/rules 2014-11-07 12:00:00.000000000 +0100
@@ -35,6 +35,7 @@
endif
build:
+ touch man/hello.1
./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS)" $(confflags) --prefix=/usr
$(MAKE)
Reply to: