Changeset b308cf9 for debian

Timestamp:

2010-06-05T23:21:02Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1fdb0a4

Parents:

3ab1d31 (diff), e774815 (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 libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

Location:

debian

Files:

• bitlbee-common.config (moved) (moved from debian/config) (1 prop)
• bitlbee-common.docs (added)
• bitlbee-common.examples (added)
• bitlbee-common.templates (moved) (moved from debian/templates)
• bitlbee.init (modified) (1 diff, 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)
• changelog (modified) (1 diff)
• compat (added)
• conffiles (deleted)
• control (modified) (2 diffs)
• patches/bitlbee.conf.diff (modified) (1 diff)
• po/POTFILES.in (modified) (1 diff)
• rules (modified) (1 diff)

debian/bitlbee.init

@@ -38 +38 @@
 d_start() {
         # Make sure BitlBee can actually write its PID...
-        touch /var/run/bitlbee.pid
-        chown bitlbee: /var/run/bitlbee.pid
+        touch $PIDFILE
+        chown bitlbee: $PIDFILE
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \

debian/changelog

@@ +1 @@
+bitlbee (1.3-0) unstable; urgency=low
+
+  * Setting some bogus version number, fix that later.
+  * Now using debhelper to improve maintainability.
+  * Added a bitlbee-libpurple package, and split off docs and stuff into
+    bitlbee-common.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 05 Jun 2010 15:16:38 +0100
+
+bitlbee (1.2.6a-1) unstable; urgency=low
+
+  * New upstream version.
+  * Native support for Twitter.
+  * Fixed /WHOIS response format. (Closes: #576120)
+  * Problems with bitlbee-skype are solved by now. (Closes: #575572)
+
+ -- Wilmer van der Gaast <wilmer@peer.gaast.net>  Tue, 20 Apr 2010 00:34:51 +0200
+
 bitlbee (1.2.5-1) unstable; urgency=low
 

debian/control

@@ -4 +4 @@
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
-Standards-Version: 3.8.0
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
+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)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
@@ -12 +12 @@
 Package: bitlbee
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, net-tools, ${debconf-depends}, debianutils (>= 1.16)
-Description: An IRC to other chat networks gateway
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Conflicts: bitlbee-libpurple
+Replaces: bitlbee-libpurple
+Description: An IRC to other chat networks gateway (default version)
  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, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Conflicts: bitlbee
+Replaces: bitlbee
+Description: An IRC to other chat networks gateway (using libpurple)
+ 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.
+ .
+ This package contains a version of BitlBee that uses the libpurple instant
+ messaging library instead of built-in code, which adds support for more IM
+ protocols (all protocols supported by Pidgin/Finch) and features (like file
+ transfers), at the price of being less lightweight.
+ .
+ This variant may not be very suitable for BitlBee instances used by many
+ (tens or hundreds) of clients.
+
+Package: bitlbee-common
+Architecture: all
+Depends: ${misc:Depends}, net-tools
+Replaces: bitlbee
+Description: An IRC to other chat networks gateway (common files/docs)
+ 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.
+ .
+ This package contains common files (mostly documentation) for bitlbee and
+ bitlbee-libpurple.
+
 Package: bitlbee-dev
 Architecture: all
-Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
-Description: An IRC to other chat networks gateway
+Depends: ${misc:Depends}, bitlbee (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~)
+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, ICQ, AIM, MSN and Yahoo.

debian/patches/bitlbee.conf.diff

@@ -1 @@
---- debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-01 00:20:24.000000000 +0100
-+++ debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-07 21:16:19.000000000 +0100
+--- bitlbee.conf        2009-06-01 00:20:24.000000000 +0100
++++ bitlbee.conf        2009-06-07 21:16:19.000000000 +0100
 @@ -23,13 +23,18 @@
  ## If BitlBee is started by root as a daemon, it can drop root privileges,

debian/po/POTFILES.in

@@ -1 @@
-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] bitlbee-common.templates

debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
+#
+# Finally switching to debhelper.
+#
+# Not using debhelper was an exercise suggested to me by my AM (Gergely
+# Nagy). It was educating at the time but I finally decided that the
+# exercise is over now.
+#
 
+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_VERSION ?= "$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')"
-export BITLBEE_VERSION
+BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
 endif
 
-build-arch: build-arch-stamp
-build-arch-stamp:
-        [ -d debian ]
-        ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent
-        $(MAKE)
-#       $(MAKE) -C doc/ all
-        touch build-arch-stamp
+build: build-stamp
+build-stamp:
+        dh_testdir
+
+        mkdir -p debian/build-native
+        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(BITLBEE_CONFIGURE_FLAGS)
+        $(MAKE) -C debian/build-native
+
+        mkdir -p debian/build-libpurple
+        ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
+        $(MAKE) -C debian/build-libpurple
+
+        touch build-stamp
 
 clean:
-        [ "`whoami`" = "root" -a -d debian ]
-        rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files debian/bitlbee-dev
+        dh_testdir
+        dh_testroot
+        rm -f build-stamp
+
+        rm -rf build-arch-stamp debian/build-*
         $(MAKE) distclean
-#       -$(MAKE) -C doc/ clean
-                                
 
-install-arch: build-arch
-        [ "`whoami`" = "root" -a -d debian ]
-        mkdir -p debian/bitlbee/DEBIAN/
-        $(MAKE) install install-etc DESTDIR=`pwd`/debian/bitlbee
+        dh_clean
 
-        mkdir -p debian/bitlbee/usr/share/doc/bitlbee/
-        cp doc/user-guide/user-guide.txt debian/bitlbee/usr/share/doc/bitlbee/
-        cp doc/user-guide/user-guide.html debian/bitlbee/usr/share/doc/bitlbee/
+install: build
+        dh_testdir
+        dh_testroot
+        dh_prep
+        dh_installdirs
 
-install-indep: install-arch
-        [ "`whoami`" = "root" -a -d debian ]
-        mkdir -p debian/bitlbee-dev/DEBIAN/
-        $(MAKE) install-dev DESTDIR=`pwd`/debian/bitlbee-dev
+        $(MAKE) -C debian/build-native install install-etc DESTDIR=`pwd`/debian/bitlbee
+        $(MAKE) -C debian/build-libpurple install install-etc DESTDIR=`pwd`/debian/bitlbee-libpurple
+        $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
 
-        mkdir -p debian/bitlbee-dev/usr/share/doc/bitlbee-dev/
+        patch debian/bitlbee/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+        patch debian/bitlbee-libpurple/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
 
-binary-arch: build-arch install-arch
-        [ "`whoami`" = "root" -a -d debian ]
+        mkdir -p debian/bitlbee-common/usr
+        mv debian/bitlbee/usr/share debian/bitlbee-common/usr
+        rm -rf debian/bitlbee-libpurple/usr/share
 
-        chmod 755 debian/post* debian/pre* debian/config debian/bitlbee.init
+binary-common:
+        dh_testdir
+        dh_testroot
 
-        mkdir -p debian/bitlbee/usr/share/doc/bitlbee/examples/ debian/bitlbee/etc/init.d/
-        -cp doc/RELEASE-SPEECH* debian/bitlbee/usr/share/doc/bitlbee/ && gzip -9 debian/bitlbee/usr/share/doc/bitlbee/RELEASE-SPEECH*
-        cp doc/CREDITS doc/AUTHORS doc/README doc/FAQ debian/README.Debian debian/bitlbee/usr/share/doc/bitlbee/
-        cp debian/changelog debian/bitlbee/usr/share/doc/bitlbee/changelog.Debian
-        cp debian/copyright debian/bitlbee/usr/share/doc/bitlbee/copyright
-        cp doc/CHANGES debian/bitlbee/usr/share/doc/bitlbee/changelog
-        cp utils/* debian/bitlbee/usr/share/doc/bitlbee/examples/
-        cp debian/bitlbee.init debian/bitlbee/etc/init.d/bitlbee
-        patch -p0 < debian/patches/bitlbee.conf.diff
-        cd debian/bitlbee/usr/share/; \
-                gzip -9 doc/bitlbee/changelog.Debian doc/bitlbee/changelog doc/bitlbee/user-guide.txt \
-                        doc/bitlbee/examples/* man/man8/bitlbee.8 man/man5/bitlbee.conf.5
-        
-        chown -R root:root debian/bitlbee/
-        find debian/bitlbee/usr/share/ -type d -exec chmod 755 {} \;
-        find debian/bitlbee/usr/share/ -type f -exec chmod 644 {} \;
-        
-        cp debian/prerm debian/bitlbee/DEBIAN/
-        cp debian/postinst debian/bitlbee/DEBIAN/
-        cp debian/postrm debian/bitlbee/DEBIAN/
-        cp debian/config debian/bitlbee/DEBIAN/
+        dh_installdocs --link-doc=bitlbee-common
+        dh_installchangelogs doc/CHANGES
+        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_VERSION
+        echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars
+        dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0
+else
+        dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+[^+]*$$//')
+endif
+        dh_md5sums
+        dh_builddeb
 
-        po2debconf debian/templates > debian/bitlbee/DEBIAN/templates
-        cp debian/conffiles debian/bitlbee/DEBIAN/
-        
-        if [ "$(DEBUG)" = "0" ]; then strip -R .comment -R .note debian/bitlbee/usr/sbin/bitlbee; fi
+binary-indep: build install
+        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-        cd debian/bitlbee; \
-                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
-        dpkg-shlibdeps -Tdebian/bitlbee.substvars -dDepends debian/bitlbee/usr/sbin/bitlbee
-ifdef BITLBEE_FORCE_VERSION
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -v1:$(BITLBEE_VERSION)-0 -V'debconf-depends=debconf (>= 1.2.0) | debconf-2.0'
-else
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -V'debconf-depends=debconf (>= 1.2.0) | debconf-2.0'
-endif
+binary-arch: build install
+        $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
-        dpkg --build debian/bitlbee ..
+binary-%: build install
+        make -f debian/rules binary-common DH_OPTIONS=-p$*
 
-binary-indep: install-indep
-        [ "`whoami`" = "root" -a -d debian ]
-
-        chown -R root.root debian/bitlbee-dev/
-        find debian/bitlbee-dev/usr/share/ -type d -exec chmod 755 {} \;
-        find debian/bitlbee-dev/usr/share/ -type f -exec chmod 644 {} \;
-
-        cp debian/changelog debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
-        gzip -9 debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
-        cp debian/copyright debian/bitlbee-dev/usr/share/doc/bitlbee-dev/copyright
-
-        cd debian/bitlbee-dev; \
-                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
-
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
-
-        dpkg --build debian/bitlbee-dev ..
-
-binary: binary-arch binary-indep
-build: build-arch
-install: install-arch install-indep
-
-.PHONY: build-arch build clean binary-arch binary install-arch install binary-indep install-indep
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install