aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2016-05-20 23:02:45 +0200
committerMarius Halden <marius.h@lden.org>2016-05-20 23:02:45 +0200
commit36e282c49b0dc22ea31c157cf9f8268d44814e06 (patch)
tree384d97562fb4a66b46566522765891ab4284ef7b /debian
parentdbb146b273dccad03e1aa5561926b808e104e3f0 (diff)
parentd3b99b6f68a7b030c653c4086de7bbba76a30636 (diff)
Merge branch 'master' into patched-master
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control3
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1b3b6cb8..8e423588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bitlbee (3.4.2-1) UNRELEASED; urgency=medium
+
+ * Make the build reproducible by not encoding ARCH / CPU defines in
+ the binary.
+ * Fix Vcs-* control headers after migration to Git.
+
+ -- Jelmer Vernooij <jelmer@debian.org> Sun, 15 May 2016 17:15:13 +0000
+
bitlbee (3.4.1-1) unstable; urgency=medium
* Fix copyright info (Closes: #764181)
diff --git a/debian/control b/debian/control
index 435d8d06..d5283d6e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Jelmer Vernooij <jelmer@debian.org>
Standards-Version: 3.9.5
Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~)
Homepage: http://www.bitlbee.org/
-Vcs-Bzr: http://code.bitlbee.org/bitlbee/
+Vcs-Git: https://github.com/bitlbee/bitlbee
+Vcs-Browser: https://github.com/bitlbee/bitlbee
Package: bitlbee
Architecture: any