Bug#765669: avifile: not binNMU safe

2014-10-20 Thread Ondřej Surý
Hi,

JFTR I have NMUed the package to really fix binNMUability. You cannot
use dh_linkdoc from any->all (see #747141) and you should almost never
use (= ${source:Version), but you always want (>= ${source:Version})
when declaring a relationship between any to all packages.

The package has been uploaded to DELAYED/2 as it delays the
libjpeg-turbo transition by breaking any reverse (build) dependencies.

Used patches attached.

Cheers,
-- 
Ondřej Surý 
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server
From 89692e2939500debfd339d1c705349dc91698f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= 
Date: Mon, 20 Oct 2014 13:28:43 +0200
Subject: [PATCH 3/3] avifile 1:0.7.48~20090503.ds-16.1

---
 debian/changelog | 17 +
 1 file changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f4435b1..63d74ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+avifile (1:0.7.48~20090503.ds-16.1) unstable; urgency=medium
+
+  * Make the package binNMUable (Closes: #765669)
+   + Use >= ${source:Version} instead of = ${source:Version}
+   + Remove the dh_linkdoc any->all relation that doesn't work and add
+ maintscript(s) to change symlink to docs
+
+ -- Ondřej Surý   Mon, 20 Oct 2014 13:27:50 +0200
+
+avifile (1:0.7.48~20090503.ds-16.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Use >= ${source:Version} instead of = ${source:Version} to allow
+binNMUs (Closes: #765669)
+
+ -- Ondřej Surý   Mon, 20 Oct 2014 13:18:51 +0200
+
 avifile (1:0.7.48~20090503.ds-16) unstable; urgency=low
 
   * Make libavifile-0.7-common binNMU version safe. (Closes: #760067)
-- 
2.1.1

From 7429378e6f8357ba6dd4855a33c90b256c06aac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= 
Date: Mon, 20 Oct 2014 13:27:47 +0200
Subject: [PATCH 2/3] Remove the dh_linkdoc any->all and add maintscript
 helpers to change symlink to docs

---
 debian/libavifile-0.7-bin.maintscript | 1 +
 debian/libavifile-0.7-dev.maintscript | 1 +
 debian/libavifile-0.7c2.maintscript   | 1 +
 debian/rules  | 3 ---
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 debian/libavifile-0.7-bin.maintscript
 create mode 100644 debian/libavifile-0.7-dev.maintscript
 create mode 100644 debian/libavifile-0.7c2.maintscript

diff --git a/debian/libavifile-0.7-bin.maintscript b/debian/libavifile-0.7-bin.maintscript
new file mode 100644
index 000..8cb4395
--- /dev/null
+++ b/debian/libavifile-0.7-bin.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libavifile-0.7-bin/ /usr/share/doc/libavifile-0.7-common 1:0.7.48~20090503.ds-16.1~ -- "$@"
diff --git a/debian/libavifile-0.7-dev.maintscript b/debian/libavifile-0.7-dev.maintscript
new file mode 100644
index 000..2d9cdfa
--- /dev/null
+++ b/debian/libavifile-0.7-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libavifile-0.7-dev/ /usr/share/doc/libavifile-0.7-common 1:0.7.48~20090503.ds-16.1~ -- "$@"
diff --git a/debian/libavifile-0.7c2.maintscript b/debian/libavifile-0.7c2.maintscript
new file mode 100644
index 000..41f224a
--- /dev/null
+++ b/debian/libavifile-0.7c2.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libavifile-0.7c2/ /usr/share/doc/libavifile-0.7-common 1:0.7.48~20090503.ds-16.1~ -- "$@"
diff --git a/debian/rules b/debian/rules
index 5f9a521..a8c7a12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,3 @@ override_dh_auto_install:
 	@rm -f debian/tmp/usr/share/doc/lib$(aviversion)-common/COPYING
 	@rm -f debian/tmp/usr/share/doc/lib$(aviversion)-common/ChangeLog
 	@chmod a+x debian/tmp/usr/share/$(aviversion)/scripts/avicap-*
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=libavifile-0.7-common
-- 
2.1.1

From f0af98ebcba1dd273b848bdc2c0d0cf38c8c98f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= 
Date: Mon, 20 Oct 2014 13:18:47 +0200
Subject: [PATCH 1/3] Use >= ${source:Version} instead of = ${source:Version}
 to allow binNMUs (Closes: #765669)

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index fe86b70..c222c55 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Description: toolkit for libavifile
 Package: libavifile-0.7c2
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libavifile-0.7-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libavifile-0.7-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: avifile-divx-plugin (<< 1:0.7.48~20090503.ds-5),
 avifile-mad-plugin (<< 1:0.7.48~20090503.ds-5),
 avifile-mjpeg-plugin (<< 1:0.7.48~20090503.ds-5),
@@ -83,7 +83,7 @@ Description: development header files for libavifile
 Package: libavifile-0.7-bin
 Architecture: any
 Section: misc
-Depends: libavifile-0.7-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libavifile-0.7-common (>=

Bug#765669: avifile: not binNMU safe

2014-10-17 Thread Emilio Pozuelo Monfort
Source: avifile
Version: 1:0.7.48~20090503.ds-16
Severity: serious

Your package is still not binNMU safe:

onscripter build-depends on:
- libavifile-0.7-dev
libavifile-0.7-dev depends on:
- libavifile-0.7c2 (= 1:0.7.48~20090503.ds-16+b2)
libavifile-0.7c2 depends on missing:
- libavifile-0.7-common (= 1:0.7.48~20090503.ds-16+b2)

This is making various packages unbuildable (e.g. onscripter or vxl).

Emilio


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org