Merging in the Ubuntu packaging versions

5 files changed, 19 insertions, 3 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
diff --git a/debian/changelog b/debian/changelog
index c1493ee..de24a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add debian/watch.
+  * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't
+    insist on having *only* debian/ in bzr. This gives us the best of both
+    worlds, bzd-bd auto-downloading orig.tar.gz and merging in the
+    pre-generated autoconf stuff, and retaining the possibility of merging
+    directly from trunk, since we keep the full upstream source in this branch.
+  * debian/copyright: Fix download location.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 17 Mar 2009 10:51:46 +0100
+
 indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low
 
   * New upstream version
@@ -10,7 +22,7 @@ indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Sun, 15 Mar 2009 08:58:20 -0500
 
-indicator-applet (0.1.1-0ubuntu2) UNRELEASED; urgency=low
+indicator-applet (0.1.1-0ubuntu2) jaunty; urgency=low
 
   * src/applet-main.c, applet_fill_cb(): Do not show anything if we
     are running under a stracciatella GNOME session (i. e. without
diff --git a/debian/copyright b/debian/copyright
index 9326fc7..074097c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Ted Gould <ted@canonical.com> on
 Wed, 11 Feb 2009 15:41:06 -0600.
 
-It was downloaded from <http://launchpad.net/indicate-applet/>
+It was downloaded from <http://launchpad.net/indicator-applet/>
 
 Upstream Author:
 
diff --git a/debian/rules b/debian/rules
index 1c64b91..27b72eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,4 @@ include /usr/share/cdbs/1/class/gnome.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
+DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)'
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..e8ab1bd
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/indicator-applet/+download .*/indicator-applet-([0-9.]+)\.tar\.gz