Changeset f8d2cff

Timestamp:

2018-04-11T06:16:02Z (7 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

17cc2fe

Parents:

8d7b0a4

git-author:

dequis <dx@…> (11-04-18 05:58:33)

git-committer:

dequis <dx@…> (11-04-18 06:16:02)

Message:

debian: turn -common and -dev into arch:any to safely use --link-doc

This started with trying to remove something that says "remove the hack
below once Hardy and Lenny are deprecated". Hardy and Lenny have been
deprecated for years, this should be easy, right?

Turns out that the symlink stuff we were doing can result in broken
packages with binNMU, see debbug#767839. This is also documented in the
dh_installdocs man page:

CAVEAT 2: The use of --link-doc should only be done when the packages
have same "architecture" type. A link from a architecture independent
package to a architecture dependent package (or vice versa) will not
work. Since compat 10, debhelper will actively reject unsupported
combinations.

And we were doing essentially the same wrong thing but manually.

The easiest way to solve this is to stop mixing arch:any and arch:all,
and to make everything arch:any. Let's hope this is as easy as it looks.

Thanks to bunk, nthykier and olly from #debian-devel for help with this.

Location:

debian

Files:

• control (modified) (5 diffs)
• rules (modified) (4 diffs)

debian/control

@@ -12 +12 @@
 Package: bitlbee
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
@@ -22 +22 @@
 Package: bitlbee-libpurple
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
 Conflicts: bitlbee
 Replaces: bitlbee
@@ -38 +38 @@
 
 Package: bitlbee-common
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}, adduser
 Replaces: bitlbee
@@ -50 +50 @@
 
 Package: bitlbee-dev
-Architecture: all
-Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
+Architecture: any
+Depends: ${misc:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
 Description: IRC to other chat networks gateway (dev files)
  This program can be used as an IRC server which forwards everything you
@@ -61 +61 @@
 Package: bitlbee-plugin-otr
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
 Description: IRC to other chat networks gateway (OTR plugin)
  This program can be used as an IRC server which forwards everything you

debian/rules

@@ -35 +35 @@
 HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
 
-# No difference at the build stage so just call main build target.
-# (Well indep could be docs-only but we prebuild them plus it's really
-# not that much work.)
-build-arch build-indep: build
+build-arch: build
 
 build: build-stamp
@@ -98 +95 @@
         dh_installchangelogs doc/CHANGES
         dh_installexamples
-        dh_installdocs #--link-doc=bitlbee-common
-        # TODO: Restore --link-doc up here and remove the hack below once
-        # Hardy and Lenny are deprecated.
-        for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
+        dh_installdocs --link-doc=bitlbee-common
         dh_installdebconf
 ifeq ($(HAS_DH_SYSTEMD),1)
@@ -123 +117 @@
         dh_builddeb
 
-binary-indep: build install
-        DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
-
 binary-arch: build install
         DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
@@ -132 +123 @@
         DH_OPTIONS=-p$* $(MAKE) -f debian/rules binary-common
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary-common binary install
+binary: binary-arch
+.PHONY: build clean binary-arch binary-common binary install