summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/gbp.conf2
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index af0a50c57..5bf131080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (1.0.1ubuntu2.1) UNRELEASED; urgency=medium
+
+ * Implement CacheDB for source packages in apt-ftparchive
+ LP: #1329212
+ * Only do openpty() if both stdin/stdout are terminals (Closes: 746434)
+ LP: #1324399
+ * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466)
+ * fix tests and add db-util to the test dependencies
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 12 Jun 2014 09:54:47 +0200
+
apt (1.0.1ubuntu2) trusty; urgency=low
* fix symlink of etc/apt/apt.conf.d/01autoremove when runnning in
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0b205c1fd..089405f49 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
[DEFAULT]
prebuild = ./prepare-release pre-export
postbuild = ./prepare-release post-build
-debian-branch = ubuntu/master
+debian-branch = ubuntu/trusty
debian-tag = %(version)s