Changeset 4c03881

Timestamp:

2010-06-05T16:39:58Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4772500

Parents:

095a5f0

Message:

Remaining fixes: All looks good now, apt and dpkg seem to do the right
thing with the -common transition, etc.

Location:

debian

Files:

• bitlbee-common.config (moved) (moved from debian/config) (1 prop)
• bitlbee-common.templates (moved) (moved from debian/templates)
• bitlbee.init (modified) (1 prop)
• bitlbee.postinst (moved) (moved from debian/postinst) (1 prop)
• bitlbee.postrm (moved) (moved from debian/postrm) (1 prop)
• bitlbee.prerm (moved) (moved from debian/prerm) (1 prop)
• control (modified) (5 diffs)
• rules (modified) (3 diffs)

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), debconf-2.0, po-debconf, libpurple-dev
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 7)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
@@ -12 +12 @@
 Package: bitlbee
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, net-tools, debianutils (>= 1.16), bitlbee-common (>= ${source:Version}), bitlbee-common (<< ${source:Version}.1~)
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Conflicts: bitlbee-libpurple
+Replaces: bitlbee-libpurple
 Description: An IRC to other chat networks gateway
  This program can be used as an IRC server which forwards everything you
@@ -19 +21 @@
 Package: bitlbee-libpurple
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, net-tools, debianutils (>= 1.16), bitlbee-common (>= ${source:Version}), bitlbee-common (<< ${source:Version}.1~)
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Conflicts: bitlbee
+Replaces: bitlbee
 Description: An IRC to other chat networks gateway
  This program can be used as an IRC server which forwards everything you
@@ -34 +38 @@
 Package: bitlbee-common
 Architecture: all
-Replaces: bitlbee (<= 1.3)
+Depends: ${misc:Depends}, net-tools
+Replaces: bitlbee
 Description: An IRC to other chat networks gateway
  This program can be used as an IRC server which forwards everything you
@@ -44 +49 @@
 Package: bitlbee-dev
 Architecture: all
-Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
+Depends: ${misc:Depends}, bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
 Description: An IRC to other chat networks gateway
  This program can be used as an IRC server which forwards everything you

debian/rules

@@ -11 +11 @@
 DEBUG ?= 0
 
-ifdef BITLBEE_VERSION
-BITLBEE_FORCE_VERSION=1
-else
+ifndef BITLBEE_VERSION
 # Want to use the full package version number instead of just the release.
 BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
@@ -68 +66 @@
         dh_installdebconf
         dh_installinit
+ifeq ($(DH_OPTIONS),-a)
+        cp -a debian/bitlbee/etc debian/bitlbee-libpurple
+endif
         dh_installman
         dh_strip
@@ -74 +75 @@
         dh_fixperms
         dh_installdeb
+ifeq ($(DH_OPTIONS),-a)
+        cp -a debian/bitlbee/DEBIAN/{post,pre}* debian/bitlbee-libpurple/DEBIAN
+endif
         dh_shlibdeps
-ifdef BITLBEE_FORCE_VERSION
+ifdef BITLBEE_VERSION
         dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0
 else