aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-07-05 15:49:29 -0500
committerTed Gould <ted@gould.cx>2011-07-05 15:49:29 -0500
commit6e9e154652d00e0a685f9efe0f2aa99e7e0f808d (patch)
tree838ac38a76c1e9f26d8972db5aa3a64484af3b75
parentd5366011a599f600ffe56cc1a42c2ee068f96151 (diff)
parent8693295fdec51ac441fc1cc40a4f27ce7cc08110 (diff)
downloadlibayatana-appindicator-6e9e154652d00e0a685f9efe0f2aa99e7e0f808d.tar.gz
libayatana-appindicator-6e9e154652d00e0a685f9efe0f2aa99e7e0f808d.tar.bz2
libayatana-appindicator-6e9e154652d00e0a685f9efe0f2aa99e7e0f808d.zip
Sync to U. Desktop
-rw-r--r--debian/changelog19
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules10
3 files changed, 22 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 0d387b7..f476274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,22 @@
-libappindicator (0.3.0-0ubuntu1~ppa1) natty; urgency=low
+libappindicator (0.3.0-0ubuntu3) oneiric; urgency=low
+
+ * No change rebuild to depend on libdbusmenu-gtk4 (instead of -gtk3)
+ LP: #803667
+
+ -- Michael Terry <mterry@ubuntu.com> Tue, 05 Jul 2011 16:17:48 -0400
+
+libappindicator (0.3.0-0ubuntu2) oneiric; urgency=low
+
+ * Call dh_python2 from binary-fixup rather than binary-predeb, so that
+ generated maintainer script snippets actually end up in the package.
+ * Remove unused libmono-dev build-dependency (for Mono 2.10 transition).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 21 Jun 2011 17:50:12 +0100
+
+libappindicator (0.3.0-0ubuntu1) natty; urgency=low
* New upstream release.
- * Don't use GIcon with GtkStatusIcon (LP: #708118)
+ * Don't use GIcon with GtkStatusIcon (LP: #708118) (LP: #729150)
-- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 15:50:55 -0500
diff --git a/debian/control b/debian/control
index 142f80d..12aec6f 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends: debhelper (>= 7.0),
cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.3),
gtk-sharp2-gapi,
- libmono-dev,
libnunit-cil-dev,
libgtk2.0-cil-dev,
gobject-introspection,
diff --git a/debian/rules b/debian/rules
index a149c98..c0e407f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,17 +97,17 @@ binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1
dh_makeclilibs -V
dh_installcligac
+binary-fixup/python-appindicator::
+ dh_python2 -ppython-appindicator
+ find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \;
+ find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \;
+
binary-predeb/gir%::
dh_girepository -p$(cdbs_curpkg)
binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1
dh_clideps -plibappindicator0.1-cil
-binary-predeb/python-appindicator::
- dh_python2 -ppython-appindicator
- find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \;
- find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \;
-
common-binary-predeb-arch:: list-missing
dh_fixperms
dh_strip