aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-02-03 11:57:57 +0100
committerTed Gould <ted@canonical.com>2009-02-03 11:57:57 +0100
commit0223011f6c1da31f11e8d5e44f0276be34a2d7fe (patch)
tree51b471186b1c882e42476579ffb4d05f18d5a700 /debian
parent21a212b200cfec762cf7405454b69410e7ba630a (diff)
parent3c879bc2428ec4d9db9e8031ced6b931bed2b210 (diff)
downloadlibayatana-indicator-0223011f6c1da31f11e8d5e44f0276be34a2d7fe.tar.gz
libayatana-indicator-0223011f6c1da31f11e8d5e44f0276be34a2d7fe.tar.bz2
libayatana-indicator-0223011f6c1da31f11e8d5e44f0276be34a2d7fe.zip
Merge from trunk
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog30
-rw-r--r--debian/control5
-rw-r--r--debian/libindicate-dev.install9
-rw-r--r--debian/libindicate0.install (renamed from debian/libindicate.install)0
4 files changed, 36 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 7558022..712ea42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+indicator-applet (0.1~ppa21) intrepid; urgency=low
+
+ * Adding in package fixes from seb128
+ * Removing scrollkeeper
+ * Changing libindicate to libindicate0
+ * Removing .la file
+ * Removing targets for files in libindcate-dev.install
+ * Removing pkg-create-dbgsym
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 03 Feb 2009 11:34:02 +0100
+
+indicator-applet (0.1~ppa20) intrepid; urgency=low
+
+ * Adding a build depend on pkg-create-dbgsym
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 02 Feb 2009 13:38:05 +0100
+
+indicator-applet (0.1~ppa19) intrepid; urgency=low
+
+ * Bump for PPA
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 02 Feb 2009 10:43:32 +0100
+
+indicator-applet (0.1~ppa18) intrepid; urgency=low
+
+ * Adding interface for listener sending back a display
+ request.
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 30 Jan 2009 15:06:47 -0600
+
indicator-applet (0.1~ppa17) intrepid; urgency=low
* Fixing the handling of named DBus connections
diff --git a/debian/control b/debian/control
index 2b47abf..9d04325 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 5.0),
libpanel-applet2-dev (>= 2.0.0),
libdbus-glib-1-dev,
gnome-doc-utils,
- scrollkeeper,
libtool,
intltool,
gobject-introspection (>= 0.6),
@@ -24,7 +23,7 @@ Depends: ${shlibs:Depends},
Description: Applet for the GNOME panel providing various indicators for
display to users.
-Package: libindicate
+Package: libindicate0
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -36,7 +35,7 @@ Section: libdevel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libindicate (= ${binary:Version}),
+ libindicate0 (= ${binary:Version}),
libdbus-glib-1-dev (>= 0.76),
libgtk2.0-dev (>= 2.12.0)
Description: Development files.
diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install
index 76e63d7..4623919 100644
--- a/debian/libindicate-dev.install
+++ b/debian/libindicate-dev.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/include/ usr/
-debian/tmp/usr/lib/pkgconfig usr/lib/
-debian/tmp/usr/lib/libindicate.a usr/lib/
-debian/tmp/usr/lib/libindicate.la usr/lib/
-debian/tmp/usr/lib/libindicate.so usr/lib/
+debian/tmp/usr/include/
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libindicate.a
+debian/tmp/usr/lib/libindicate.so
diff --git a/debian/libindicate.install b/debian/libindicate0.install
index a83aa8a..a83aa8a 100644
--- a/debian/libindicate.install
+++ b/debian/libindicate0.install