Changeset 4772500

Timestamp:

2010-06-05T17:35:39Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e774815

Parents:

4c03881

Message:

Put in the necessary hacks to make version number spoofing work again.

Location:

debian

Files:

• control (modified) (3 diffs)
• rules (modified) (3 diffs)

debian/control

@@ -12 +12 @@
 Package: bitlbee
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
@@ -21 +21 @@
 Package: bitlbee-libpurple
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
 Conflicts: bitlbee
 Replaces: bitlbee
@@ -49 +49 @@
 Package: bitlbee-dev
 Architecture: all
-Depends: ${misc:Depends}, bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
+Depends: ${misc:Depends}, bitlbee (>= ${bee:Version}), bitlbee (<< ${bee: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

@@ -20 +20 @@
         dh_testdir
 
-        mkdir debian/build-native
+        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 debian/build-libpurple
+        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
@@ -62 +62 @@
 
         dh_installdocs --link-doc=bitlbee-common
-        dh_installchangelogs
+        dh_installchangelogs doc/CHANGES
         dh_installexamples
         dh_installdebconf
@@ -80 +80 @@
         dh_shlibdeps
 ifdef BITLBEE_VERSION
-        dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0
+        echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars
+        dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0
 else
-        dh_gencontrol
+        dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+[^+]*$$//')
 endif
         dh_md5sums