aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-07-06 15:50:48 -0500
committerTed Gould <ted@gould.cx>2011-07-06 15:50:48 -0500
commit9a18c1c095a420b16431b4f411d627786448a81a (patch)
treef14abb7c44170acf84cb05f90b255b9ae133f071
parent97e2fede61bdc63816f0ff2ccf1d5b1d58a13916 (diff)
parent36fb97c7c97c3b40b48190e8e37b494bdff9edb9 (diff)
downloadlibayatana-indicator-9a18c1c095a420b16431b4f411d627786448a81a.tar.gz
libayatana-indicator-9a18c1c095a420b16431b4f411d627786448a81a.tar.bz2
libayatana-indicator-9a18c1c095a420b16431b4f411d627786448a81a.zip
Sync to U. Desktop
-rw-r--r--debian/changelog12
-rw-r--r--debian/control5
-rw-r--r--debian/libindicator3-dev.install1
3 files changed, 14 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 2d8cb98..54cdbc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-libindicator (0.3.22-0ubuntu1~ppa1) natty; urgency=low
+libindicator (0.3.22-0ubuntu2) oneiric; urgency=low
+
+ * debian/libindicator3-dev.install
+ - Don't install the headers twice, we only need them in libindicator-dev
+ * debian/control
+ - Make libindicator3-dev depend on libindicator-dev (LP: #3803136)
+ - Bump standards version to 3.9.2
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 29 Jun 2011 10:39:15 +0100
+
+libindicator (0.3.22-0ubuntu1) natty; urgency=low
* New upstream release.
* Adding the ability to know the environment the indicator
diff --git a/debian/control b/debian/control
index 7cdb2a7..5d03e92 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5.0),
intltool,
gtk-doc-tools,
dh-autoreconf
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
Homepage: https://launchpad.net/libindicator
Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
@@ -73,7 +73,8 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libgtk-3-dev (>= 2.91.3),
- libindicator3-3 (= ${binary:Version})
+ libindicator3-3 (= ${binary:Version}),
+ libindicator-dev (= ${binary:Version})
Description: panel indicator applet - library development files
This library contains information to build indicators to go into
the indicator applet.
diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install
index d11f81d..2ac38b7 100644
--- a/debian/libindicator3-dev.install
+++ b/debian/libindicator3-dev.install
@@ -1,4 +1,3 @@
-debian/tmp/usr/include/libindicator3-0.3/libindicator/*
debian/tmp/usr/lib/pkgconfig/indicator3.pc
debian/tmp/usr/lib/libindicator3.a
debian/tmp/usr/lib/libindicator3.so