From a74264a996f89ed4bcd6cc3210c8c8ba51c3908d Mon Sep 17 00:00:00 2001 From: seb128 Date: Mon, 16 Mar 2009 23:23:33 +0100 Subject: updated shlibs version --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 1c64b91..27b72eb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,4 +5,4 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed - +DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' -- cgit v1.2.3 From 321d1da208cdff46bc14897dfcb73ded56815a12 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 13:39:45 -0500 Subject: Removing all the gobject stuff from the debian build files --- debian/libindicate-dev.install | 1 - debian/libindicate0.install | 1 - debian/rules | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install index f65d387..4623919 100644 --- a/debian/libindicate-dev.install +++ b/debian/libindicate-dev.install @@ -2,4 +2,3 @@ debian/tmp/usr/include/ debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/libindicate.a debian/tmp/usr/lib/libindicate.so -debian/tmp/usr/share/gir/ diff --git a/debian/libindicate0.install b/debian/libindicate0.install index 9369053..0618a58 100644 --- a/debian/libindicate0.install +++ b/debian/libindicate0.install @@ -1,2 +1 @@ debian/tmp/usr/lib/libindicate.so.* -debian/tmp/usr/lib/girepository/ diff --git a/debian/rules b/debian/rules index 27b72eb..3025b6a 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 +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' -- cgit v1.2.3 From bff1218cd071d1c27e7fc6bc17c55251cbb6f956 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 5 Aug 2009 09:50:42 +0100 Subject: indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low * debian/rules - added --enable-gtk-doc to build the docs -- Ken VanDine Wed, 05 Aug 2009 09:50:17 +0100 --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index f73f46b..d2f8ca2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low + + * debian/rules + - added --enable-gtk-doc to build the docs + + -- Ken VanDine Wed, 05 Aug 2009 09:50:17 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu2) karmic; urgency=low * Run ./autogen.sh before upload 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)' -- cgit v1.2.3 From a810a01a01d6600cc3a2dace659fcaf387b92f72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 18 Aug 2009 13:45:00 -0500 Subject: * Merging in the seperation from indicator-applet * debian/* Removing all of the indicator-applet stuff --- debian/changelog | 3 +- debian/control | 111 ++---------------------------------- debian/copyright | 20 ------- debian/indicator-applet-sus.install | 2 - debian/indicator-applet.install | 4 -- debian/libindicate-dev.install | 4 -- debian/libindicate-doc.install | 2 - debian/libindicate-gtk-dev.install | 4 -- debian/libindicate-gtk0.install | 1 - debian/libindicate2.install | 1 - debian/rules | 2 - debian/watch | 2 +- 12 files changed, 8 insertions(+), 148 deletions(-) delete mode 100644 debian/indicator-applet-sus.install delete mode 100644 debian/indicator-applet.install delete mode 100644 debian/libindicate-dev.install delete mode 100644 debian/libindicate-doc.install delete mode 100644 debian/libindicate-gtk-dev.install delete mode 100644 debian/libindicate-gtk0.install delete mode 100644 debian/libindicate2.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index bbb70e4..281b0b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libindicator (0.2.0~bzr325-0ubuntu1~ppa1) UNRELEASED; urgency=low - * Merging in the separation from indicator-applet + * Merging in the seperation from indicator-applet + * debian/* Removing all of the indicator-applet stuff -- Ted Gould Tue, 18 Aug 2009 13:39:35 -0500 diff --git a/debian/control b/debian/control index 86c1447..1c91055 100644 --- a/debian/control +++ b/debian/control @@ -1,99 +1,13 @@ -Source: indicator-applet -Section: gnome +Source: libindicator +Section: libs Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libgtk2.0-dev (>= 2.12.0), - libpanel-applet2-dev (>= 2.0.0), - libdbus-glib-1-dev, - gnome-doc-utils, - libgnomeui-dev, - libtool, - intltool, - libxml2-dev, - gtk-doc-tools + libtool Standards-Version: 3.8.0 -Homepage: https://launchpad.net/indicator-applet -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu - -Package: indicator-applet -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gnome-panel, - indicator-messages -Description: GNOME panel indicator applet - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - Currently this includes support for messaging applications in the - indicator-messages package. - -Package: indicator-applet-sus -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gnome-panel, - indicator-applet (= ${binary:Version}) -Description: A clone of the GNOME panel indicator applet. - Indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This instance will only load the SUS indicator which provies - status changing, user choosing and session management. - -Package: libindicate2 -Section: libs -Conflicts: libindicate -Replaces: libindicate -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains shared libraries to be used by applications. - -Package: libindicate-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicate2 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76) -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains files that are needed to build applications. - -Package: libindicate-gtk0 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains shared libraries to be used by applications. - -Package: libindicate-gtk-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicate-gtk0 (= ${binary:Version}), - libindicate-dev (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0) -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains files that are needed to build applications. +Homepage: https://launchpad.net/libindicator +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libindicator/ubuntu Package: libindicator-dev Section: libdevel @@ -107,18 +21,3 @@ Description: GNOME panel indicator applet - shared library . This package contains files that are needed to build applications. -Package: libindicate-doc -Section: doc -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicate2 (= ${binary:Version}), - libindicate-gtk0 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0) -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel.ยท - . - This package contains files that are needed to build applications. - diff --git a/debian/copyright b/debian/copyright index 074097c..ca1ebdd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -29,25 +29,5 @@ License: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. -License for libindicate/* (libindicate0 and libindicate-dev packages): - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 or 3 of the License. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU Lesser General Public License -can be found in `/usr/share/common-licenses/LGPL-2.1' and -`/usr/share/common-licenses/LGPL-3'. - The Debian packaging is (C) 2009, Canonical Ltd. and is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install deleted file mode 100644 index 3a016e0..0000000 --- a/debian/indicator-applet-sus.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server -debian/tmp/usr/lib/indicator-applet/indicator-applet-sus diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install deleted file mode 100644 index 772d432..0000000 --- a/debian/indicator-applet.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server -debian/tmp/usr/lib/indicator-applet/indicator-applet -debian/tmp/usr/lib/indicator-applet/listen-and-print -debian/tmp/usr/share/icons diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install deleted file mode 100644 index 81e1396..0000000 --- a/debian/libindicate-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/include/libindicate-0.1/libindicate/* -debian/tmp/usr/lib/pkgconfig/indicate.pc -debian/tmp/usr/lib/libindicate.a -debian/tmp/usr/lib/libindicate.so diff --git a/debian/libindicate-doc.install b/debian/libindicate-doc.install deleted file mode 100644 index 55af9eb..0000000 --- a/debian/libindicate-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/gtk-doc/html/libindicate/* -debian/tmp/usr/share/doc/indicator-applet/examples/* diff --git a/debian/libindicate-gtk-dev.install b/debian/libindicate-gtk-dev.install deleted file mode 100644 index 5f0e682..0000000 --- a/debian/libindicate-gtk-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/include/libindicate-0.1/libindicate-gtk/* -debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc -debian/tmp/usr/lib/libindicate-gtk.a -debian/tmp/usr/lib/libindicate-gtk.so diff --git a/debian/libindicate-gtk0.install b/debian/libindicate-gtk0.install deleted file mode 100644 index fc6b412..0000000 --- a/debian/libindicate-gtk0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicate-gtk.so.* diff --git a/debian/libindicate2.install b/debian/libindicate2.install deleted file mode 100644 index 0618a58..0000000 --- a/debian/libindicate2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicate.so.* diff --git a/debian/rules b/debian/rules index 27ff7f1..744b984 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,4 @@ 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 --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' diff --git a/debian/watch b/debian/watch index e8ab1bd..16f79e0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://launchpad.net/indicator-applet/+download .*/indicator-applet-([0-9.]+)\.tar\.gz +http://launchpad.net/libindicator/+download .*/libindicator-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From 259bcc9933de10b893dd9feeca3d18cde6bc5f1f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 14:26:58 -0600 Subject: debian/rules: Updating shlibs number --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 4d9c0a5..83a7e5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.5-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * debian/rules: Updating shlibs number + + -- Ted Gould Thu, 11 Mar 2010 14:26:32 -0600 + libindicator (0.3.5-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.3.5 diff --git a/debian/rules b/debian/rules index 5ee8f88..5e14c74 100755 --- a/debian/rules +++ b/debian/rules @@ -5,4 +5,4 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.3)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.5)' -- cgit v1.2.3 From 218c6a8d5f51f002e214f8ec74738e95b2efecdf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Mar 2010 10:59:10 -0500 Subject: debian/rules: Updating shlibs --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 123a0d7..fc74400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libindicator (0.3.6-0ubuntu1~ppa1) UNRELEASED; urgency=low * Upstream release 0.3.6 * Adding in scroll signals for the indicators + * debian/rules: Updating shlibs -- Ted Gould Thu, 18 Mar 2010 10:53:02 -0500 diff --git a/debian/rules b/debian/rules index 5e14c74..151c78d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,4 +5,4 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.5)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' -- cgit v1.2.3 From 79f7355391b87f88f79330f4d7507ef72c15734c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 13 Aug 2010 11:57:45 +0200 Subject: releasing version 0.3.11-0ubuntu2 --- debian/changelog | 10 ++++ debian/control | 4 +- debian/patches/workaround-icon-crash.patch | 74 ++++++++++++++++++++++++++++++ debian/rules | 3 ++ 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 debian/patches/workaround-icon-crash.patch (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 438fe31..f495c3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libindicator (0.3.11-0ubuntu2) maverick; urgency=low + + * workaround-icon-crash.patch: + - change from Mikkel Kamstrup Erlandsen to workaround a crasher in the + new version + * debian/control: + - updated the gtk build requirement + + -- Sebastien Bacher Fri, 13 Aug 2010 11:40:29 +0200 + libindicator (0.3.11-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index af01ed9..6530e9b 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), - libgtk2.0-dev (>= 2.12.0), + libgtk2.0-dev (>= 2.18), libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu diff --git a/debian/patches/workaround-icon-crash.patch b/debian/patches/workaround-icon-crash.patch new file mode 100644 index 0000000..5b6f1d6 --- /dev/null +++ b/debian/patches/workaround-icon-crash.patch @@ -0,0 +1,74 @@ +=== modified file 'libindicator/indicator-image-helper.c' +--- libindicator/indicator-image-helper.c 2010-08-12 19:37:24 +0000 ++++ libindicator/indicator-image-helper.c 2010-08-13 09:03:45 +0000 +@@ -29,61 +29,15 @@ + static void + refresh_image (GtkImage * image) + { ++ GIcon * icon; ++ + g_return_if_fail(GTK_IS_IMAGE(image)); +- const gchar * icon_filename = NULL; +- GtkIconInfo * icon_info = NULL; +- gint icon_size = 22; +- +- GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); +- g_return_if_fail(icon_names != NULL); +- +- /* Get the default theme */ +- GtkIconTheme * default_theme = gtk_icon_theme_get_default(); +- g_return_if_fail(default_theme != NULL); +- +- /* Look through the themes for that icon */ +- icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); +- if (icon_info == NULL) { +- /* Try using the second item in the names, which should be the original filename supplied */ +- const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); +- if (names) { +- icon_filename = names[1]; +- } else { +- g_warning("Unable to find icon\n"); +- return; +- } +- } else { +- /* Grab the filename */ +- icon_filename = gtk_icon_info_get_filename(icon_info); +- } +- g_return_if_fail(icon_filename != NULL); /* An error because we don't have a filename */ +- +- /* Build a pixbuf */ +- GError * error = NULL; +- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); +- +- if (icon_info != NULL) { +- gtk_icon_info_free(icon_info); +- } +- +- if (pixbuf == NULL) { +- g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); +- return; +- } +- +- /* Scale icon if all we get is something too big. */ +- if (gdk_pixbuf_get_height(pixbuf) > icon_size) { +- gfloat scale = (gfloat)icon_size / (gfloat)gdk_pixbuf_get_height(pixbuf); +- gint width = round(gdk_pixbuf_get_width(pixbuf) * scale); +- +- GdkPixbuf * scaled = gdk_pixbuf_scale_simple(pixbuf, width, icon_size, GDK_INTERP_BILINEAR); +- g_object_unref(G_OBJECT(pixbuf)); +- pixbuf = scaled; +- } +- +- /* Put the pixbuf on the image */ +- gtk_image_set_from_pixbuf(image, pixbuf); +- g_object_unref(G_OBJECT(pixbuf)); ++ ++ icon = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); ++ g_return_if_fail(G_IS_ICON (icon)); ++ ++ gtk_image_set_pixel_size (image, 22); ++ gtk_image_set_from_gicon (image, icon, GTK_ICON_SIZE_SMALL_TOOLBAR); + + return; + } + diff --git a/debian/rules b/debian/rules index 151c78d..095f53b 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' + -- cgit v1.2.3 From a006528f328d99f16647616b006c8ae3172d3d3f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 19 Sep 2010 14:42:21 -0500 Subject: * debian/rules: * Dropping the simple patch system * Changing the shlibs to libindicator1 --- debian/changelog | 8 ++++++++ debian/rules | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 66a78c3..e69298b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libindicator (0.3.13-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * debian/rules: + * Dropping the simple patch system + * Changing the shlibs to libindicator1 + + -- Ted Gould Sun, 19 Sep 2010 14:41:46 -0500 + libindicator (0.3.13-0ubuntu1~ppa2) maverick; urgency=low * Upstream Merge diff --git a/debian/rules b/debian/rules index 095f53b..9099854 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)' -- cgit v1.2.3 From 98f804c2c5b4852c91796195dd3140d57f2afbc3 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 10:05:24 +0200 Subject: redo removed adjustements --- debian/changelog | 17 +++++++++-------- debian/control | 5 ++--- debian/rules | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 3b7ca79..2fda7f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,20 @@ -libindicator (0.3.14-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.14-0ubuntu1) UNRELEASED; urgency=low * New upstream release. - * Adding a function to signal a menu is shown + * Adding a function to signal a menu is shown (LP: #637692) * Changing indicator directory to '4' - - -- Ted Gould Tue, 21 Sep 2010 15:55:56 -0500 - -libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low - * debian/source: - don't use quilt format, it's making the daily build not working * debian/control: - rename to soname bump + - put the Vcs-Bzr to point the right official branch * debian/libindicator1.install: rename to soname bump - * debian/rules: update MAKESHLIBS_ARGS + * debian/rules: + - update MAKESHLIBS_ARGS + + [Ted Gould] + * debian/rules: + - removing simple-patchsys -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 diff --git a/debian/control b/debian/control index 0dfe822..a67274d 100644 --- a/debian/control +++ b/debian/control @@ -14,15 +14,14 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libindicator0 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. diff --git a/debian/rules b/debian/rules index 9099854..7ad558a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,5 +6,5 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' -- cgit v1.2.3 From 8915dd59667cd7aae74860ee063374b24734e03c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Nov 2010 18:39:14 -0500 Subject: * debian/rules - Added build targets to build with gtk3 enabled in additional to default build with gtk2 * debian/control - Updated build depends to support building with gtk+-3.0 - Added dh-autoreconf build depends - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries binaries * libindicator/Makefile.am and tools/Makefile.am - Fixes needed for building with-gtk=3 --- debian/changelog | 16 +++++++++++++-- debian/control | 41 ++++++++++++++++++++++++++++++++++++-- debian/libindicator-tools.install | 2 +- debian/libindicator3-1.install | 1 + debian/libindicator3-dev.install | 3 +++ debian/libindicator3-tools.install | 1 + debian/rules | 31 +++++++++++++++++++++++++++- libindicator/Makefile.am | 4 ++-- libindicator3-1.install | 1 + tools/Makefile.am | 15 ++++++++++++-- 10 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 debian/libindicator3-1.install create mode 100644 debian/libindicator3-dev.install create mode 100644 debian/libindicator3-tools.install create mode 100644 libindicator3-1.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index aafd6ce..86b8a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,23 @@ -libindicator (0.3.15-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.15-0ubuntu1) UNRELEASED; urgency=low + + * debian/rules + - Added build targets to build with gtk3 enabled in additional to + default build with gtk2 + * debian/control + - Updated build depends to support building with gtk+-3.0 + - Added dh-autoreconf build depends + - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries + binaries + * libindicator/Makefile.am and tools/Makefile.am + - Fixes needed for building with-gtk=3 + [ Ted Gould ] * New upstream release. * Adding a small file to set debugging environment variables * Allowing to build for GTK 2/3 and build parallel libraries * debian/control: Adding package libindicator-debugenv - -- Ted Gould Thu, 11 Nov 2010 14:44:51 -0600 + -- Ken VanDine Wed, 24 Nov 2010 18:29:40 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 5f33619..a7e93cb 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,12 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), + libgtk3.0-dev (>= 2.91.3), libdbus-glib-1-dev, libtool, intltool, - gtk-doc-tools + gtk-doc-tools, + dh-autoreconf Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu @@ -54,7 +56,7 @@ Description: Tools for libindicator Package: libindicator-debugenv Section: devel -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicator1 (= ${binary:Version}) @@ -62,3 +64,38 @@ Description: Debug environment for libindicator Sets debug values useful for developers of applications using indicators. . This package contains session configuration files + +Package: libindicator3-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains the library itself. + +Package: libindicator3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk3.0-dev (>= 2.91.3), + libindicator3-1 (= ${binary:Version}) +Description: panel indicator applet - library development files + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. + +Package: libindicator3-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicator3-1 (= ${binary:Version}) +Description: Tools for libindicator + Tools useful for developers of applications using indicators. + . + This package contains files that are needed to build applications. diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index e9565f0..07cd88f 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1 +1 @@ -debian/tmp/usr/lib/libindicator/* +debian/tmp/usr/lib/libindicator/indicator-loader diff --git a/debian/libindicator3-1.install b/debian/libindicator3-1.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install new file mode 100644 index 0000000..2ac38b7 --- /dev/null +++ b/debian/libindicator3-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/pkgconfig/indicator3.pc +debian/tmp/usr/lib/libindicator3.a +debian/tmp/usr/lib/libindicator3.so diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install new file mode 100644 index 0000000..2766bc0 --- /dev/null +++ b/debian/libindicator3-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator/indicator-loader3 diff --git a/debian/rules b/debian/rules index 7ad558a..e4f4f04 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,38 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk +DEB_SRCDIR = . +DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' +DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)' +configure/libindicator3-1:: stamp-configure-gtk3 +stamp-configure-gtk3: + : # configure for GTK+ 3.0 + set -e; \ + rm -rf build-gtk3; \ + mkdir build-gtk3; \ + cd build-gtk3; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ + cd ..; + touch stamp-configure-gtk3 + +build/libindicator3-1:: stamp-build-gtk3 +stamp-build-gtk3: stamp-configure-gtk3 + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3; + touch stamp-build-gtk3 + +common-install-prehook-arch:: stamp-build-gtk3 + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install + +clean:: + rm -f stamp-*-gtk3 + rm -rf build-gtk3 diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 39cb2b7..b6239e6 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -73,7 +73,7 @@ glib_marshal_prefix = _indicator_object_marshal indicator-object-enum-types.h: s-enum-types-h @true s-enum-types-h: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) @@ -81,7 +81,7 @@ s-enum-types-h: $(indicator_headers) indicator-object-enum-types.c: s-enum-types-c @true s-enum-types-c: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ && rm -f tmp-indicator-object-enum-types.c diff --git a/libindicator3-1.install b/libindicator3-1.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/libindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c67491..9861ac1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,11 +1,13 @@ if USE_GTK3 INDICATOR_LIB = -lindicator3 +libexec_PROGRAMS = indicator-loader3 +VER=3 else +VER= INDICATOR_LIB = -lindicator +libexec_PROGRAMS = indicator-loader endif -libexec_PROGRAMS = \ - indicator-loader ############################# # Indicator Loader @@ -17,6 +19,7 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ @@ -24,6 +27,14 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ $(INDICATOR_LIB) +# We duplicate these here because Automake won't let us use $(VER) on the left hand side. +# Since we carefully use $(VER) in the right hand side above, we can assign the same values. +# Only one version of the library is every compiled at the same time, so it is safe to reuse +# the right hand sides like this. +indicator_loader3_SOURCES = $(indicator_loader_SOURCES) +indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) +indicator_loader3_LDADD = $(indicator_loader_LDADD) + xsessiondir = $(sysconfdir)/X11/Xsession.d xsession_DATA = 80indicator-debugging -- cgit v1.2.3 From 4a4ca1e84dab55c11301277ebc820dc3f9f7c9de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 15:29:13 -0600 Subject: debian/rules: Updating shlibs --- debian/changelog | 3 ++- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index c10fc4e..a4dc996 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libindicator (0.3.18-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. * Adding a signal for scrolling that includes the entry + * debian/rules: Updating shlibs - -- Ted Gould Thu, 27 Jan 2011 15:28:23 -0600 + -- Ted Gould Thu, 27 Jan 2011 15:29:02 -0600 libindicator (0.3.17-0ubuntu1~ppa1) natty; urgency=low diff --git a/debian/rules b/debian/rules index e4f4f04..de71b0a 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,8 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)' +DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.18)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.18)' configure/libindicator3-1:: stamp-configure-gtk3 stamp-configure-gtk3: -- cgit v1.2.3 From f44a6bcf14243565e49f368b9db7423f49f871ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 00:38:18 -0500 Subject: * debian/*install, control: Changing ABI version number bump in package names * debian/rules: Making GTK2 the special case as GTK3 is default now --- debian/changelog | 4 +++- debian/control | 18 ++++++++++-------- debian/libindicator3-3.install | 1 - debian/libindicator3-4.install | 1 + debian/libindicator3.install | 1 - debian/libindicator4.install | 1 + debian/rules | 40 ++++++++++++++++++++-------------------- 7 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 debian/libindicator3-3.install create mode 100644 debian/libindicator3-4.install delete mode 100644 debian/libindicator3.install create mode 100644 debian/libindicator4.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index bdba7bd..e8a7008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618) + * debian/*install, control: Changing ABI version number bump in package names + * debian/rules: Making GTK2 the special case as GTK3 is default now - -- Ted Gould Thu, 07 Jul 2011 00:28:56 -0500 + -- Ted Gould Thu, 07 Jul 2011 00:37:34 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index 5d03e92..c7cb436 100644 --- a/debian/control +++ b/debian/control @@ -18,13 +18,14 @@ 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 -Package: libindicator3 +Package: libindicator4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libindicator1 (<= ${binary:Version}), - libindicator2 (<= ${binary:Version}) + libindicator2 (<= ${binary:Version}), + libindicator3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -37,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -49,18 +50,19 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-3 +Package: libindicator3-4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator3-2 (<= ${binary:Version}) +Breaks: libindicator3-2 (<= ${binary:Version}), + libindicator3-3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -73,7 +75,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-3 (= ${binary:Version}), + libindicator3-4 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -86,7 +88,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-3 (= ${binary:Version}) + libindicator3-4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator3-3.install b/debian/libindicator3-3.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-4.install b/debian/libindicator3-4.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3.install b/debian/libindicator3.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator4.install b/debian/libindicator4.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/rules b/debian/rules index 4c21f86..4581c33 100755 --- a/debian/rules +++ b/debian/rules @@ -9,31 +9,31 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)' +DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' -configure/libindicator3-3:: stamp-configure-gtk3 -stamp-configure-gtk3: - : # configure for GTK+ 3.0 +configure/libindicator4:: stamp-configure-gtk2 +stamp-configure-gtk2: + : # configure for GTK+ 2.0 set -e; \ - rm -rf build-gtk3; \ - mkdir build-gtk3; \ - cd build-gtk3; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + rm -rf build-gtk2; \ + mkdir build-gtk2; \ + cd build-gtk2; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ cd ..; - touch stamp-configure-gtk3 + touch stamp-configure-gtk2 -build/libindicator3-3:: stamp-build-gtk3 -stamp-build-gtk3: stamp-configure-gtk3 - : # build for GTK+ 3.0 - $(MAKE) -C build-gtk3; - touch stamp-build-gtk3 +build/libindicator4:: stamp-build-gtk2 +stamp-build-gtk2: stamp-configure-gtk2 + : # build for GTK+ 2.0 + $(MAKE) -C build-gtk2; + touch stamp-build-gtk2 -common-install-prehook-arch:: stamp-build-gtk3 - : # install for GTK+ 3.0 - $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install +common-install-prehook-arch:: stamp-build-gtk2 + : # install for GTK+ 2.0 + $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install clean:: - rm -f stamp-*-gtk3 - rm -rf build-gtk3 + rm -f stamp-*-gtk2 + rm -rf build-gtk2 -- cgit v1.2.3 From c292980b2487057592929d5b9b9c4446013241c5 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 10:55:25 -0400 Subject: * debian/rules - Simplify the dual builds with cdbs - Fixed package names to match soname * debian/*.install fixed paths to work with the dual builds change * tools/Makefile.in - Fixed path for xsessiondir * debian/control - Fixed package names to match soname --- debian/changelog | 15 ++++++++++-- debian/control | 12 +++++----- debian/libindicator-dev.install | 8 +++---- debian/libindicator-tools.install | 4 ++-- debian/libindicator3-4.install | 1 - debian/libindicator3-6.install | 1 + debian/libindicator3-dev.install | 6 ++--- debian/libindicator3-tools.install | 2 +- debian/libindicator4.install | 1 - debian/libindicator6.install | 1 + debian/rules | 47 +++++++++++++------------------------- tools/Makefile.in | 2 +- 12 files changed, 48 insertions(+), 52 deletions(-) delete mode 100644 debian/libindicator3-4.install create mode 100644 debian/libindicator3-6.install delete mode 100644 debian/libindicator4.install create mode 100644 debian/libindicator6.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 5cc9fb0..eefe70a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libindicator (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.3.90-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * New upstream release. * Build Fixes * Adding license to test files (LP: #684886) @@ -11,7 +12,17 @@ libindicator (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low * debian/rules: Making GTK2 the special case as GTK3 is default now * debian/*install: Fixing pkgconfig file names - -- Ted Gould Thu, 07 Jul 2011 08:29:37 -0500 + [ Ken VanDine ] + * debian/rules + - Simplify the dual builds with cdbs + - Fixed package names to match soname + * debian/*.install fixed paths to work with the dual builds change + * tools/Makefile.in + - Fixed path for xsessiondir + * debian/control + - Fixed package names to match soname + + -- Ken VanDine Thu, 07 Jul 2011 10:18:04 -0400 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index c7cb436..d9fbd97 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ 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 -Package: libindicator4 +Package: libindicator6 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -38,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator4 (= ${binary:Version}) + libindicator6 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -50,13 +50,13 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator4 (= ${binary:Version}) + libindicator6 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-4 +Package: libindicator3-6 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -75,7 +75,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-4 (= ${binary:Version}), + libindicator3-6 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -88,7 +88,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-4 (= ${binary:Version}) + libindicator3-6 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index 7f34ecd..25c2128 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicator-0.4/libindicator/* -debian/tmp/usr/lib/pkgconfig/indicator-0.4.pc -debian/tmp/usr/lib/libindicator.a -debian/tmp/usr/lib/libindicator.so +debian/tmp/gtk2/usr/include /usr/ +debian/tmp/gtk2/usr/lib/pkgconfig/indicator-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk2/usr/lib/libindicator.a /usr/lib/ +debian/tmp/gtk2/usr/lib/libindicator.so /usr/lib/ diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index 34f8177..20b86c8 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libindicator/indicator-loader -debian/tmp/usr/share/libindicator/80indicator-debugging +debian/tmp/gtk2/usr/lib/libindicator/indicator-loader /usr/lib/libindicator/ +debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging /usr/share/libindicator/ diff --git a/debian/libindicator3-4.install b/debian/libindicator3-4.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-4.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-6.install b/debian/libindicator3-6.install new file mode 100644 index 0000000..75485eb --- /dev/null +++ b/debian/libindicator3-6.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index 7381df0..4af3d44 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/pkgconfig/indicator3-0.4.pc -debian/tmp/usr/lib/libindicator3.a -debian/tmp/usr/lib/libindicator3.so +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/libindicator3-tools.install b/debian/libindicator3-tools.install index 2766bc0..47689fd 100644 --- a/debian/libindicator3-tools.install +++ b/debian/libindicator3-tools.install @@ -1 +1 @@ -debian/tmp/usr/lib/libindicator/indicator-loader3 +debian/tmp/gtk3/usr/lib/libindicator/indicator-loader3 /usr/lib/libindicator/ diff --git a/debian/libindicator4.install b/debian/libindicator4.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator4.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator6.install b/debian/libindicator6.install new file mode 100644 index 0000000..c3bfad0 --- /dev/null +++ b/debian/libindicator6.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ diff --git a/debian/rules b/debian/rules index 4581c33..17ed4cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,39 +1,24 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' - -configure/libindicator4:: stamp-configure-gtk2 -stamp-configure-gtk2: - : # configure for GTK+ 2.0 - set -e; \ - rm -rf build-gtk2; \ - mkdir build-gtk2; \ - cd build-gtk2; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ - $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ - cd ..; - touch stamp-configure-gtk2 - -build/libindicator4:: stamp-build-gtk2 -stamp-build-gtk2: stamp-configure-gtk2 - : # build for GTK+ 2.0 - $(MAKE) -C build-gtk2; - touch stamp-build-gtk2 - -common-install-prehook-arch:: stamp-build-gtk2 - : # install for GTK+ 2.0 - $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install - -clean:: - rm -f stamp-*-gtk2 - rm -rf build-gtk2 +DEB_DH_MAKESHLIBS_ARGS_libindicator6 += -V 'libindicator6 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_6 += -V 'libindicator3-6 (>= 0.3.90)' + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete diff --git a/tools/Makefile.in b/tools/Makefile.in index e01a0d4..0d46485 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -281,7 +281,7 @@ indicator_loader_LDADD = \ indicator_loader3_SOURCES = $(indicator_loader_SOURCES) indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) indicator_loader3_LDADD = $(indicator_loader_LDADD) -xsessiondir = $(sysconfdir)/X11/Xsession.d +xsessiondir = $(pkgdatadir) xsession_DATA = 80indicator-debugging EXTRA_DIST = $(xsession_DATA) all: all-am -- cgit v1.2.3 From f1c0aaffe06a3a367f9eeda6e0a78a08c670ed35 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 22 Nov 2011 14:37:23 -0500 Subject: releasing version 0.4.1-1 --- debian/changelog | 26 ++++++++++++++++++++++++++ debian/control | 7 +++---- debian/patches/debian-changes | 40 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 - debian/source/format | 1 + debian/source/options | 1 + 7 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 debian/patches/debian-changes create mode 100644 debian/patches/series create mode 100644 debian/source/format create mode 100644 debian/source/options (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index acc3613..be00b80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libindicator (0.4.1-1) experimental; urgency=low + + * Merge from Ubuntu. + + Re-enable GTK3 packages. + + Link to libm to prevent FTBFS. + Closes: #640459 + * Set single-debian-patch in debian/source/options. + + -- Evgeni Golov Sun, 02 Oct 2011 15:08:46 +0200 + libindicator (0.4.1-0ubuntu1) oneiric; urgency=low * New upstream release. @@ -77,6 +87,12 @@ libindicator (0.3.90-0ubuntu1) oneiric; urgency=low -- Ken VanDine Thu, 07 Jul 2011 10:18:04 -0400 +libindicator (0.3.22-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + + -- Evgeni Golov Tue, 29 Mar 2011 10:07:03 +0200 + libindicator (0.3.22-0ubuntu2) oneiric; urgency=low * debian/libindicator3-dev.install @@ -95,6 +111,16 @@ libindicator (0.3.22-0ubuntu1) natty; urgency=low -- Ted Gould Wed, 23 Mar 2011 13:21:49 -0500 +libindicator (0.3.21-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + * debian/control: + + Improve descriptions of the GTK3 packages. + + Standards-Version: 3.9.1 + * Disable GTK3 packages until libgtk-3-dev is in unstable. + + -- Evgeni Golov Sun, 20 Mar 2011 15:58:35 +0100 + libindicator (0.3.21-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 06ee081..1dc79b8 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,7 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: The Ayatana Packagers +Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), @@ -15,8 +14,8 @@ Build-Depends: debhelper (>= 5.0), dh-autoreconf 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 +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian Package: libindicator6 Section: libs diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000..91e0322 --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,40 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + libindicator (0.4.1-1) experimental; urgency=low + . + * Merge from Ubuntu. + + Re-enable GTK3 packages. + + Link to libm to prevent FTBFS. + Closes: #640459 + * Set single-debian-patch in debian/source/options. +Author: Evgeni Golov +Bug-Debian: http://bugs.debian.org/640459 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- libindicator-0.4.1.orig/tools/Makefile.am ++++ libindicator-0.4.1/tools/Makefile.am +@@ -19,6 +19,7 @@ indicator_loader_SOURCES = \ + indicator_loader_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ ++ -Wall -Werror \ + -DBUILD_DIR="\"$(builddir)\"" + + indicator_loader_LDADD = \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7bb8252 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes diff --git a/debian/rules b/debian/rules index 66b1948..da650c3 100755 --- a/debian/rules +++ b/debian/rules @@ -23,4 +23,3 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) common-install-arch:: find debian/tmp -name \*.la -delete cd po; intltool-update --pot --verbose - diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..7423a2d --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +single-debian-patch -- cgit v1.2.3 From 6659abf589204f0c826dd3637eaaac8c588f7a0e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 19:30:08 -0500 Subject: releasing version 0.4.90-0ubuntu1 --- debian/changelog | 16 ++++++++++------ debian/libindicator3-dev.install | 1 + debian/rules | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 5804db5..d3d483f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,4 @@ -libindicator (0.4.90-0ubuntu1~ppa1) precise; urgency=low - - [ Ken VanDine ] - * debian/control - - set ubuntu-desktop VCS and maintainer +libindicator (0.4.90-0ubuntu1) precise; urgency=low [ Ted Gould ] * New upstream release. @@ -11,7 +7,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 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 Tue, 24 Jan 2012 12:13:51 -0500 libindicator (0.4.1-1) experimental; urgency=low 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) -- cgit v1.2.3 From 36b39c96eac1bcadaf506a52b6c583155559458b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:23:06 -0600 Subject: debian/control, debian/rules: Adding in autoreconf support --- debian/changelog | 3 ++- debian/control | 1 + debian/rules | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 37ed70f..c92d5d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library + * debian/control, debian/rules: Adding in autoreconf support - -- Ted Gould Tue, 14 Feb 2012 14:21:17 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 90e1367..4816b56 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), + dh-autoreconf, cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), diff --git a/debian/rules b/debian/rules index f62d05a..7e69bc0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ DEB_MAKE_FLAVORS = gtk2 gtk3 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 7f1272a5681547e6a6cb083b699be4770c08ac96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:27:38 -0600 Subject: * debian/control, debian/rules: * Adding in autoreconf support * Adding a check rule and requiring new build deps --- debian/changelog | 6 ++++-- debian/control | 3 ++- debian/rules | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index c92d5d9..3232851 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,11 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library - * debian/control, debian/rules: Adding in autoreconf support + * debian/control, debian/rules: + * Adding in autoreconf support + * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 4816b56..998c41c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, gtk-doc-tools, - dh-autoreconf + dbus-test-runner, + xvfb Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu diff --git a/debian/rules b/debian/rules index 7e69bc0..e74ddd1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,8 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_MAKE_CHECK_TARGET := check + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' -- cgit v1.2.3 From 17133c0d617daea26c39f72c8ef527bd2cece5d0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 16:45:43 -0600 Subject: debian/rules: Adding messages --- debian/changelog | 6 ++++++ debian/rules | 2 ++ 2 files changed, 8 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 6b66327..56eade8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.4.91-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * debian/rules: Adding messages + + -- Ted Gould Tue, 14 Feb 2012 16:44:09 -0600 + libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index e74ddd1..be53e6a 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk +export G_MESSAGES_DEBUG = all + DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 28d27ed11c41ca6859c533e6a084c631225c9912 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 29 Mar 2012 13:57:09 -0700 Subject: releasing version 0.4.94-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 7ff9ca4..fe0cbf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.4.94-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.94-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix a leaked GError (LP: #965459) * Fix memory leak when the proxy's name changes. - -- Charles Kerr Thu, 29 Mar 2012 13:51:37 -0700 + -- Charles Kerr Thu, 29 Mar 2012 13:56:59 -0700 libindicator (0.4.93-0ubuntu1) precise; urgency=low diff --git a/debian/rules b/debian/rules index be53e6a..7cf6832 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 -DEB_MAKE_CHECK_TARGET := check +#DEB_MAKE_CHECK_TARGET := check LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3