Control: tag -1 + pending

Hi,

Santiago Vila wrote:
> Here is a patch:

Thanks!

I've prepared an NMU based on that patch. I'll upload it to DELAYED/2
after this mail. I've verified that a build inside an arm64 sid chroot
with install-info installed no more includes this file:

→ debdiff ../gxmessage_2.20.0-1_arm64.deb ../gxmessage_2.20.0-1.1_arm64.deb | 
colordiff
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in first .deb but not in second
-------------------------------------
-rw-r--r--  root/root   /usr/share/info/dir.gz

Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-211-] {+132+}
Version: [-2.20.0-1-] {+2.20.0-1.1+}


Full source debdiff:

diff -Nru gxmessage-2.20.0/debian/changelog gxmessage-2.20.0/debian/changelog
--- gxmessage-2.20.0/debian/changelog   2012-05-09 19:53:00.000000000 +0200
+++ gxmessage-2.20.0/debian/changelog   2015-12-07 01:26:24.000000000 +0100
@@ -1,3 +1,11 @@
+gxmessage (2.20.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch by Santiago Vila to no more ship /usr/share/info/dir.gz in
+    binary package. (Closes: #799715)
+
+ -- Axel Beckert <a...@debian.org>  Mon, 07 Dec 2015 01:26:24 +0100
+
 gxmessage (2.20.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru gxmessage-2.20.0/debian/patches/02_799715.diff 
gxmessage-2.20.0/debian/patches/02_799715.diff
--- gxmessage-2.20.0/debian/patches/02_799715.diff      1970-01-01 
01:00:00.000000000 +0100
+++ gxmessage-2.20.0/debian/patches/02_799715.diff      2015-12-07 
01:08:53.000000000 +0100
@@ -0,0 +1,16 @@
+From: Santiago Vila <sanv...@debian.org>
+Subject: Modify doc/Makefile.in to avoid /usr/share/info/dir.gz.
+Bug-Debian: https://bugs.debian.org/799715
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -773,8 +773,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 gxmessage-2.20.0/debian/patches/series 
gxmessage-2.20.0/debian/patches/series
--- gxmessage-2.20.0/debian/patches/series      2012-05-09 20:38:47.000000000 
+0200
+++ gxmessage-2.20.0/debian/patches/series      2015-12-07 01:08:19.000000000 
+0100
@@ -1 +1,2 @@
 01_549822.diff
+02_799715.diff

                Regards, Axel
-- 
 ,''`.  |  Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
  `-    |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE

Attachment: signature.asc
Description: Digital signature

Reply via email to