Merging in ~ubuntu-desktop branch.

5 files changed, 20 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 012ad6d..2b7126a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,16 +5,27 @@ indicator-session (0.1.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 03 Sep 2009 15:14:07 -0500
 
-indicator-session (0.1-0ubuntu1~ppa1) karmic; urgency=low
+indicator-session (0.1-0ubuntu1) karmic; urgency=low
 
-  * Upstream version 0.1
+  [ Ted Gould ]
+  * Upstream version 0.1 (LP: #420108)
   * debian/control: Looking for libdbusmenu* >= 0.1.0
   * debian/control: Shortening the short description and lengthening
     the long one.  Fixes a bug (LP: #412024)
+  * debian/watch:
+    - fixed url
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 27 Aug 2009 13:46:29 -0500
+  [ Martin Pitt ]
+  * Re-add dropped debian/compat.
 
-indicator-session (0.1~bzr17-0ubuntu1) UNRELEASE; urgency=low
+  Re-add fixes which got lost in branch renaming:
+  * debian/control: Fix Vcs-* links.
+  * debian/rules: debian/rules: Update *.a/*.la cleanup for -sus → -session
+    renaming.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Aug 2009 21:30:27 +0200
+
+indicator-session (0.1~bzr17-0ubuntu1) karmic; urgency=low
 
   * New snapshot (LP: #417035)
   * Package rename from 'indicator-sus' to 'indicator-session'
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index 7e6e1a6..c2b6f8d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 5.0),
                intltool
 Standards-Version: 3.8.2
 Homepage: https://launchpad.net/indicator-session
-Vcs-Bzr: lp:~ubuntu-desktop/indicator-session/ubuntu
-Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
 
 Package: indicator-session
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 7f46594..ce98752 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
 
-binary-install/indicator-sus::
+binary-install/indicator-session::
 	# remove .a/.la clutter
 	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
 	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la
diff --git a/debian/watch b/debian/watch
index 22a7bca..0205543 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/indicator-applet/+download .*/indicator-session-([0-9.]+)\.tar\.gz
+https://launchpad.net/indicator-session/+download .*/indicator-session-([0-9.]+)\.tar\.gz