Remaining fixes: All looks good now, apt and dpkg seem to do the right

thing with the -common transition, etc.

8 files changed, 18 insertions, 9 deletions

diff --git a/debian/config b/debian/bitlbee-common.config
index 9bb78237..9bb78237 100755..100644
--- a/debian/config
+++ b/debian/bitlbee-common.config
diff --git a/debian/templates b/debian/bitlbee-common.templates
index 0cd04426..0cd04426 100644
--- a/debian/templates
+++ b/debian/bitlbee-common.templates
diff --git a/debian/bitlbee.init b/debian/bitlbee.init
index be1dcd66..be1dcd66 100755..100644
--- a/debian/bitlbee.init
+++ b/debian/bitlbee.init
diff --git a/debian/postinst b/debian/bitlbee.postinst
index db541f6c..db541f6c 100755..100644
--- a/debian/postinst
+++ b/debian/bitlbee.postinst
diff --git a/debian/postrm b/debian/bitlbee.postrm
index 5c3b4b2e..5c3b4b2e 100755..100644
--- a/debian/postrm
+++ b/debian/bitlbee.postrm
diff --git a/debian/prerm b/debian/bitlbee.prerm
index 687c2cc1..687c2cc1 100755..100644
--- a/debian/prerm
+++ b/debian/bitlbee.prerm
diff --git a/debian/control b/debian/control
index dfef8e39..62cb2ec0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,21 +4,25 @@ Priority: optional
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
 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/
 DM-Upload-Allowed: yes
 
 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
  say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
 
 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
  say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
@@ -33,7 +37,8 @@ Description: An IRC to other chat networks gateway
 
 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
  say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
@@ -43,7 +48,7 @@ Description: An IRC to other chat networks gateway
 
 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
  say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
diff --git a/debian/rules b/debian/rules
index bbb368f9..8ccb181b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,7 @@
 BITLBEE_CONFIGURE_FLAGS ?=
 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}')\"
 endif
@@ -67,14 +65,20 @@ binary-common:
 	dh_installexamples
 	dh_installdebconf
 	dh_installinit
+ifeq ($(DH_OPTIONS),-a)
+	cp -a debian/bitlbee/etc debian/bitlbee-libpurple
+endif
 	dh_installman
 	dh_strip
 	dh_link
 	dh_compress
 	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
 	dh_gencontrol