aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog19
-rw-r--r--debian/control2
-rw-r--r--debian/libindicator3-dev.install1
-rwxr-xr-xdebian/rules4
4 files changed, 18 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 5804db5..9437510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-libindicator (0.4.90-0ubuntu1~ppa1) precise; urgency=low
+libindicator (0.4.90-0ubuntu2) precise; urgency=low
- [ Ken VanDine ]
* debian/control
- - set ubuntu-desktop VCS and maintainer
+ - dropped the Conflicts with libindicator6 and libindicator3-6
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jan 2012 21:44:30 -0500
+
+libindicator (0.4.90-0ubuntu1) precise; urgency=low
[ Ted Gould ]
* New upstream release.
@@ -11,7 +14,15 @@ libindicator (0.4.90-0ubuntu1~ppa1) precise; urgency=low
* Adding activate function to include Window ID
* debian/control: Bumping ABI version of lib
- -- Ted Gould <ted@ubuntu.com> Tue, 24 Jan 2012 10:17:00 -0600
+ [ Ken VanDine ]
+ * debian/control
+ - set ubuntu-desktop VCS and maintainer
+ * debian/rules
+ - Updated shlibs
+ * debian/libindicator3-dev.install
+ - include headers
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jan 2012 12:13:51 -0500
libindicator (0.4.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 218cfe1..90e1367 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: libindicator6
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.
@@ -59,7 +58,6 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: libindicator3-6
Description: panel indicator applet - shared library
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 4af3d44..e556af3 100644
--- a/debian/libindicator3-dev.install
+++ b/debian/libindicator3-dev.install
@@ -1,3 +1,4 @@
+debian/tmp/gtk3/usr/include /usr/
debian/tmp/gtk3/usr/lib/pkgconfig/indicator3-0.4.pc /usr/lib/pkgconfig/
debian/tmp/gtk3/usr/lib/libindicator3.a /usr/lib/
debian/tmp/gtk3/usr/lib/libindicator3.so /usr/lib/
diff --git a/debian/rules b/debian/rules
index da650c3..f62d05a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,8 @@ DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libindicator6 += -V 'libindicator6 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libindicator3_6 += -V 'libindicator3-6 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator3_7 += -V 'libindicator3-7 (>= 0.4.90)'
debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)