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

Unblock request for gettext 0.18.1.1-3



Hi.

Please unblock gettext 0.18.1.1-3. The complete debdiff is appended
below, and should be self-explanatory (the patch is essentially the
same I've already used in other packages for the same kind of bug).

Thanks.

diff -Nru gettext-0.18.1.1/debian/changelog gettext-0.18.1.1/debian/changelog
--- gettext-0.18.1.1/debian/changelog	2010-09-11 13:13:03.000000000 +0200
+++ gettext-0.18.1.1/debian/changelog	2010-09-19 17:10:09.000000000 +0200
@@ -1,3 +1,10 @@
+gettext (0.18.1.1-3) unstable; urgency=high
+
+  * Do not include /usr/share/info/dir.gz file in binary package if
+    install-info is present during the build. Closes: #597407.
+
+ -- Santiago Vila <sanvila@debian.org>  Sun, 19 Sep 2010 17:09:36 +0200
+
 gettext (0.18.1.1-2) unstable; urgency=medium
 
   * Changed lynx to lynx-cur in gettext Recommends, as lynx is a dummy
diff -Nru gettext-0.18.1.1/debian/patches/02-no-usr-share-info-dir-gz gettext-0.18.1.1/debian/patches/02-no-usr-share-info-dir-gz
--- gettext-0.18.1.1/debian/patches/02-no-usr-share-info-dir-gz	1970-01-01 01:00:00.000000000 +0100
+++ gettext-0.18.1.1/debian/patches/02-no-usr-share-info-dir-gz	2010-09-19 17:04:17.000000000 +0200
@@ -0,0 +1,24 @@
+--- a/gettext-runtime/libasprintf/Makefile.in
++++ b/gettext-runtime/libasprintf/Makefile.in
+@@ -1042,8 +1042,7 @@
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
+ 	@$(POST_INSTALL)
+-	@if (install-info --version && \
+-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
++	@if false; then \
+ 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+ 	  for file in $$list; do \
+ 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+--- a/gettext-tools/doc/Makefile.in
++++ b/gettext-tools/doc/Makefile.in
+@@ -1604,8 +1604,7 @@
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
+ 	@$(POST_INSTALL)
+-	@if (install-info --version && \
+-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
++	@if false; then \
+ 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+ 	  for file in $$list; do \
+ 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
diff -Nru gettext-0.18.1.1/debian/patches/series gettext-0.18.1.1/debian/patches/series
--- gettext-0.18.1.1/debian/patches/series	2010-06-13 13:44:58.000000000 +0200
+++ gettext-0.18.1.1/debian/patches/series	2010-09-19 17:06:36.000000000 +0200
@@ -1,2 +1,3 @@
 01-do-not-use-java-in-urlget
+02-no-usr-share-info-dir-gz
 99-config-guess-config-sub


Reply to: