aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/control7
-rw-r--r--debian/source/format1
3 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index b9f01e2..8b624a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libindicator (0.3.8-2ubuntu1~ppa1) UNRELEASED; urgency=low
+
+ * Merge debian changes
+ * Drop debian/source/*
+ * debian/control: Switch VCS for this branch to be the indicator
+ applet developers branch.
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 16 Jun 2010 13:27:29 -0500
+
libindicator (0.3.8-2) unstable; urgency=low
* Revert cdbs drop, as requested by the Ubuntu maintainers.
diff --git a/debian/control b/debian/control
index 5e1dfe8..af01ed9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: libindicator
Section: libs
Priority: optional
-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org>
Build-Depends: debhelper (>= 5.0),
cdbs (>= 0.4.41),
@@ -13,8 +14,8 @@ Build-Depends: debhelper (>= 5.0),
gtk-doc-tools
Standards-Version: 3.8.4
Homepage: https://launchpad.net/libindicator
-Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian
-Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
Package: libindicator0
Section: libs
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)