diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | debian/control | 14 | ||||
| -rwxr-xr-x | debian/rules | 16 |
3 files changed, 39 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 5702b417..590d7b90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,23 +1,41 @@ -bitlbee (3.0.4-1) unstable; urgency=low +bitlbee (3.0.4+z-2) UNRELEASED; urgency=low + + * Removed some version override stuff from Debian build scripts. Instead, + my buildbot now uses dch to generate a changelog entry with the right + version number. + + -- Wilmer van der Gaast <wilmer@gaast.net> Fri, 23 Dec 2011 09:45:55 +0100 + +bitlbee (3.0.4+bzr855-1) unstable; urgency=low * New upstream release. + * This is not a vanilla 3.0.4 tree but a Bazaar snapshot. The source + release was a few weeks ago by now. There should be no significant + differences. * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee - instead of a separate package. - * Fixed dependencies of bitlbee-plugin-otr package to not break with - binary MTUs. (Closes: #651612) + instead of a separate package. Not building these for Debian for now + though since python-skype was removed. * ^B and some other things are stripped in outgoing XMPP stanzas. (Closes: #507856) * OTR module linking fix. Not with the fix from the Debian bug but with one from bugs.bitlbee.org. I hope that covers it. (Closes: #646369) * Closing a few old bugs that were filed against the Debian package - instead of upstream: + instead of/as well as upstream: - Joining password-protected MUCs is working for a while already, set the password using "chan set". (Closes: #615624) - "Headline:" msgs (Closes: #605459) - Yahoo! was fixed long ago and Etch is deprecated. (Closes: #476529) - identi.ca support is documented. (Closes: #613789) - -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 11 Dec 2011 16:53:31 +0000 + -- Wilmer van der Gaast <wilmer@gaast.net> Tue, 20 Dec 2011 12:46:42 +0100 + +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 <jcristau@debian.org> Thu, 15 Dec 2011 20:34:32 +0100 bitlbee (3.0.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 41fc0366..181feccb 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ DM-Upload-Allowed: yes 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 @@ Description: An IRC to other chat networks gateway (default version) 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 @@ Description: An IRC to other chat networks gateway (common files/docs) 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 @@ Description: An IRC to other chat networks gateway (dev files) Package: bitlbee-plugin-otr Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~), 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 @@ -71,7 +71,7 @@ Description: An IRC to other chat networks gateway (OTR plugin) Package: bitlbee-plugin-skype Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~) +Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version}) Recommends: skyped Description: An IRC to other chat networks gateway (Skype plugin) This program can be used as an IRC server which forwards everything you @@ -82,8 +82,8 @@ Description: An IRC to other chat networks gateway (Skype plugin) You need to download and install the Skype client for this to work. Package: skyped -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7) +Architecture: all +Depends: ${misc:Depends}, ${shlibs:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7) Recommends: skype Description: Daemon to control Skype remotely Daemon to control the GUI Skype client. Currently required to control Skype diff --git a/debian/rules b/debian/rules index 57d60090..2c9e3a12 100755 --- a/debian/rules +++ b/debian/rules @@ -7,16 +7,18 @@ # exercise is over now. # -# Include the bitlbee-libpurple variant and OTR plugin by default +# Include the bitlbee-libpurple variant and OTR plugin by default. +# Don't build skype by default since it depends on deleted/non-free +# packages. Need to at least get python-skype back into Debian. BITLBEE_LIBPURPLE ?= 1 BITLBEE_OTR ?= plugin -BITLBEE_SKYPE ?= plugin +BITLBEE_SKYPE ?= 0 BITLBEE_CONFIGURE_FLAGS ?= DEBUG ?= 0 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) @@ -71,11 +73,13 @@ install: build $(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped +ifneq ($(BITLBEE_SKYPE),0) mkdir -p debian/bitlbee-plugin-skype/usr mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr mkdir -p debian/skyped/usr/share/man/man1 mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1 +endif ifeq ($(BITLBEE_LIBPURPLE),1) $(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple @@ -105,11 +109,7 @@ binary-common: dh_fixperms dh_installdeb dh_shlibdeps -ifdef BITLBEE_VERSION - dh_gencontrol -- -v$(BITLBEE_VERSION) -Vbee:Version=$(BITLBEE_VERSION) -else - dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+b[0-9]\+$$//') -endif + dh_gencontrol dh_md5sums dh_builddeb |