aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-08-05 17:53:44 +0100
committerTed Gould <ted@canonical.com>2009-08-05 17:53:44 +0100
commita3eb3eaa1500d9c9778f407c7e939a890aa9bdca (patch)
tree9bf0fff08db2f7add978e68f4a82e345bda5a9bf /debian
parent6a2b4b1719b877ed300f5a2eee1e83096ecad537 (diff)
parent8223eb61915a7ee010d4ac754066ea36a1db50e1 (diff)
downloadlibayatana-indicator-a3eb3eaa1500d9c9778f407c7e939a890aa9bdca.tar.gz
libayatana-indicator-a3eb3eaa1500d9c9778f407c7e939a890aa9bdca.tar.bz2
libayatana-indicator-a3eb3eaa1500d9c9778f407c7e939a890aa9bdca.zip
Update to core-dev branch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog32
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules2
3 files changed, 16 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index 9b06f5e..26c8aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,25 @@
-indicator-applet (0.2.0~bzr319-0ubuntu1~ppa5) karmic; urgency=low
+indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low
- * Upstream fix for server.c and get indicators with hidden
- indicators in the list.
+ * Add build-dep on gtk-doc-tools
- -- Ted Gould <ted@ubuntu.com> Wed, 05 Aug 2009 01:26:43 +0100
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Aug 2009 11:28:57 +0100
-indicator-applet (0.2.0~bzr319-0ubuntu1~ppa4) karmic; urgency=low
+indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low
- * Upstream fix to PC file.
+ * debian/rules
+ - added --enable-gtk-doc to build the docs
- -- Ted Gould <ted@ubuntu.com> Tue, 04 Aug 2009 12:29:39 +0100
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Aug 2009 09:50:17 +0100
-indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) karmic; urgency=low
+indicator-applet (0.2.0~bzr319-0ubuntu2) karmic; urgency=low
- * debian/control: Fixing the library reference of
- libindicate-gtk-dev
+ * Run ./autogen.sh before upload
- -- Ted Gould <ted@ubuntu.com> Tue, 04 Aug 2009 10:53:48 +0100
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Aug 2009 00:40:52 +0100
-indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) karmic; urgency=low
-
- * Forgot to autogen.sh
-
- -- Ted Gould <ted@ubuntu.com> Tue, 04 Aug 2009 10:51:47 +0100
-
-indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) karmic; urgency=low
+indicator-applet (0.2.0~bzr319-0ubuntu1) karmic; urgency=low
+ [ Ted Gould ]
* Merging in upstream code to split out libindicate-gtk
* debian/control:
* Changing the version number of libindcate to 2 to match
@@ -38,7 +32,7 @@ indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) karmic; urgency=low
* Modified libindicate-dev to be more specific about the header
files that it grabs.
- -- Ted Gould <ted@ubuntu.com> Tue, 04 Aug 2009 10:27:31 +0100
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 05 Aug 2009 00:22:54 +0100
indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low
diff --git a/debian/control b/debian/control
index 23e0158..4281a15 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 5.0),
libgnomeui-dev,
libtool,
intltool,
- libxml2-dev
+ libxml2-dev,
+ gtk-doc-tools
Standards-Version: 3.8.0
Homepage: https://launchpad.net/indicator-applet
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu
diff --git a/debian/rules b/debian/rules
index 3025b6a..27ff7f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection --enable-gtk-doc
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)'