Control: tag -1 + patch

On Wed, 10 Jan 2018 13:45:48 +0100, Andreas Beckmann wrote:

> during a test with piuparts I noticed your packages failed to install
> together because both ship /usr/share/doc/libgtkmm-2.4-dev/examples/*

This probably a side effect of using debhelper compat level 11.

Now the question is what the desired outcome is; there are two
*.examples files which partly install the same files into the -doc
and the -dev package, which looks a bit surprising to me anyway.

Personally, I'd tend to install the demos (only) into the -dev
package, as that's what it says on the tin (long description).
That's what the attached debdiff does.


Cheers,
gregor, from the Bern BSP

-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru gtkmm2.4-2.24.5/debian/changelog gtkmm2.4-2.24.5/debian/changelog
--- gtkmm2.4-2.24.5/debian/changelog	2017-12-18 02:14:58.000000000 +0100
+++ gtkmm2.4-2.24.5/debian/changelog	2018-12-01 10:55:06.000000000 +0100
@@ -1,3 +1,13 @@
+gtkmm2.4 (1:2.24.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "both ship usr/share/doc/libgtkmm-2.4-dev/examples/*":
+    Install all demos into the -dev package, and only there;
+    and also install Makefile*.
+    (Closes: #886836)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 01 Dec 2018 10:55:06 +0100
+
 gtkmm2.4 (1:2.24.5-2) unstable; urgency=medium
 
   * Update Vcs fields for conversion to git
diff -Nru gtkmm2.4-2.24.5/debian/libgtkmm-2.4-dev.examples gtkmm2.4-2.24.5/debian/libgtkmm-2.4-dev.examples
--- gtkmm2.4-2.24.5/debian/libgtkmm-2.4-dev.examples	2017-12-18 02:14:58.000000000 +0100
+++ gtkmm2.4-2.24.5/debian/libgtkmm-2.4-dev.examples	2018-12-01 10:48:32.000000000 +0100
@@ -1,4 +1 @@
-demos/README
-demos/Makefile.am
-demos/*.cc
-demos/gtk-demo
+demos/*
diff -Nru gtkmm2.4-2.24.5/debian/libgtkmm-2.4-doc.examples gtkmm2.4-2.24.5/debian/libgtkmm-2.4-doc.examples
--- gtkmm2.4-2.24.5/debian/libgtkmm-2.4-doc.examples	2017-12-18 02:14:58.000000000 +0100
+++ gtkmm2.4-2.24.5/debian/libgtkmm-2.4-doc.examples	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-demos/*
diff -Nru gtkmm2.4-2.24.5/debian/rules gtkmm2.4-2.24.5/debian/rules
--- gtkmm2.4-2.24.5/debian/rules	2017-12-18 02:14:58.000000000 +0100
+++ gtkmm2.4-2.24.5/debian/rules	2018-12-01 10:55:06.000000000 +0100
@@ -21,10 +21,10 @@
 override_dh_strip:
 	dh_strip --dbgsym-migration='libgtkmm-2.4-dbg (<< 1:2.24.5-1~)'
 
-# Don't compress doxygen tag files
+# Don't compress doxygen tag files and demo Makefile*
 override_dh_compress:
-	dh_compress -X.tag -X.cc
+	dh_compress -X.tag -X.cc -XMakefile
 
 override_dh_installexamples:
 	$(MAKE) -C demos distclean
-	dh_installexamples -XMakefile
+	dh_installexamples

Attachment: signature.asc
Description: Digital Signature

Reply via email to