tags 651612 + patch thanks Dear maintainer,
I've prepared an NMU for bitlbee (versioned as 3.0.3-1.1) and will upload it shortly. Please find the diff attached. Cheers, Julien
diff -u bitlbee-3.0.3/debian/changelog bitlbee-3.0.3/debian/changelog
--- bitlbee-3.0.3/debian/changelog
+++ bitlbee-3.0.3/debian/changelog
@@ -1,3 +1,11 @@
+bitlbee (3.0.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use the standard ${source:Version} and ${binary:Version} substvars instead
+ of the custom and broken ${bee:Version} (closes: #651612).
+
+ -- Julien Cristau <[email protected]> Thu, 15 Dec 2011 20:34:32 +0100
+
bitlbee (3.0.3-1) unstable; urgency=low
* New upstream release. (Skipped 3.0.2, sorry!)
diff -u bitlbee-3.0.3/debian/rules bitlbee-3.0.3/debian/rules
--- bitlbee-3.0.3/debian/rules
+++ bitlbee-3.0.3/debian/rules
@@ -15,7 +15,7 @@
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}')\"
+BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')\"
endif
ifneq ($(BITLBEE_LIBPURPLE),1)
@@ -94,9 +94,9 @@
dh_installdeb
dh_shlibdeps
ifdef BITLBEE_VERSION
- dh_gencontrol -- -v$(BITLBEE_VERSION) -Vbee:Version=$(BITLBEE_VERSION)
+ dh_gencontrol -- -v$(BITLBEE_VERSION)
else
- dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+b[0-9]\+$$//')
+ dh_gencontrol
endif
dh_md5sums
dh_builddeb
diff -u bitlbee-3.0.3/debian/control bitlbee-3.0.3/debian/control
--- bitlbee-3.0.3/debian/control
+++ bitlbee-3.0.3/debian/control
@@ -11,7 +11,7 @@
Package: bitlbee
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
Conflicts: bitlbee-libpurple
Replaces: bitlbee-libpurple
Description: An IRC to other chat networks gateway (default version)
@@ -21,7 +21,7 @@
Package: bitlbee-libpurple
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
Conflicts: bitlbee
Replaces: bitlbee
Description: An IRC to other chat networks gateway (using libpurple)
@@ -50,7 +50,7 @@
Package: bitlbee-dev
Architecture: all
-Depends: ${misc:Depends}, bitlbee (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
Description: An IRC to other chat networks gateway (dev files)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google Talk
@@ -60,7 +60,7 @@
Package: bitlbee-plugin-otr
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
Description: An IRC to other chat networks gateway (OTR plugin)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google Talk
signature.asc
Description: Digital signature
