Changeset f1cea66

Timestamp:

2010-06-07T23:50:42Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d50e22f

Parents:

6ef9065 (diff), 560d0a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging Debian fixes that I missed in the previous merge.

Location:

debian

Files:

• compat (modified) (1 diff)
• control (modified) (1 diff)
• rules (modified) (4 diffs)

debian/compat

@@ -1 @@
-7
+6

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.8.4
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 7)
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/

debian/rules

@@ -28 +28 @@
         $(MAKE) -C debian/build-libpurple
 
+        $(MAKE) -C doc
+
         touch build-stamp
 
@@ -43 +45 @@
         dh_testdir
         dh_testroot
-        dh_prep
+        dh_clean -k
         dh_installdirs
 
@@ -61 +63 @@
         dh_testroot
 
-        dh_installdocs --link-doc=bitlbee-common
         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; do rm -rf debian/$$p/usr/share/doc/$$p; ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done
         dh_installdebconf
         dh_installinit
@@ -76 +81 @@
         dh_installdeb
 ifeq ($(DH_OPTIONS),-a)
-        cp -a debian/bitlbee/DEBIAN/{post,pre}* debian/bitlbee-libpurple/DEBIAN
+        cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN
 endif
         dh_shlibdeps
 ifdef BITLBEE_VERSION
-        echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars
         dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0
 else