From 477eb614f187d1b7e35018c5a13df6db364395d0 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 19 Feb 2009 16:21:42 +0100 Subject: releasing version 0.1.1-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec3f42b..9c0b5f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.1.1-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.1.1-0ubuntu1) jaunty; urgency=low * New upstream release with some icon changes. * debian/control: Fix Vcs-Bzr. @@ -7,7 +7,7 @@ indicator-applet (0.1.1-0ubuntu1) UNRELEASED; urgency=low * debian/copyright: Fix leftover word "either" from the license description. - -- Martin Pitt Thu, 19 Feb 2009 16:07:32 +0100 + -- Martin Pitt Thu, 19 Feb 2009 16:12:01 +0100 indicator-applet (0.1-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 3bc5b8e8105d698e7782c8090148dbe8f135161f Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 19 Feb 2009 17:25:15 +0100 Subject: src/applet-main.c, applet_fill_cb(): Do not show anything if we are running under a stracciatella GNOME session (i. e. without Ubuntu components). See UbuntuSpec:stracciatella-session. --- debian/changelog | 8 ++++++++ src/applet-main.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9c0b5f5..a9fce89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-applet (0.1.1-0ubuntu2) UNRELEASED; urgency=low + + * src/applet-main.c, applet_fill_cb(): Do not show anything if we + are running under a stracciatella GNOME session (i. e. without + Ubuntu components). See UbuntuSpec:stracciatella-session. + + -- Martin Pitt Thu, 19 Feb 2009 17:24:04 +0100 + indicator-applet (0.1.1-0ubuntu1) jaunty; urgency=low * New upstream release with some icon changes. diff --git a/src/applet-main.c b/src/applet-main.c index 57dc6b3..6efd33f 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -100,6 +100,12 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data) GtkWidget *menubar; gint i; gint indicators_loaded = 0; + + /* check if we are running stracciatella session */ + if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) { + g_debug("Running stracciatella GNOME session, disabling myself"); + return TRUE; + } /* Set panel options */ gtk_container_set_border_width(GTK_CONTAINER (applet), 0); -- cgit v1.2.3 From ef381a023c9a4337e61805e4d9e7da4e0c58c965 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 15:48:02 -0600 Subject: releasing version 0.1.1-0ubuntu3~ppa3 --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 56ba0b7..9d3bcbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.1.1-0ubuntu3~ppa3) jaunty; urgency=low + + * debian/control: Adding in gobject-introspection-repository + to pull in GdkPixbuf-2.0.gir. + + -- Ted Gould Wed, 25 Feb 2009 15:47:29 -0600 + indicator-applet (0.1.1-0ubuntu3~ppa2) jaunty; urgency=low * Putting GIR into the install files. diff --git a/debian/control b/debian/control index 933e50b..5e678b6 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 5.0), intltool, gobject-introspection (>= 0.6), gobject-introspection-glib-2.0 (>= 0.6), - libgirepository-dev (>= 0.6) + libgirepository-dev (>= 0.6), + gobject-introspection-repository Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From 7ddf215e7894eae9585d2c4ef383190fd607516f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Mar 2009 19:25:27 +0200 Subject: releasing version 0.1.2-0ubuntu1~ppa1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9d3bcbe..d0a2212 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1.2-0ubuntu1~ppa1) jaunty; urgency=low + + * Merging in new upstream version 0.1.2 + + -- Ted Gould Thu, 12 Mar 2009 19:24:51 +0200 + indicator-applet (0.1.1-0ubuntu3~ppa3) jaunty; urgency=low * debian/control: Adding in gobject-introspection-repository -- cgit v1.2.3 From a015eb539014999465cd8631bfb0f219d6cd7f9e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 13 Mar 2009 09:27:09 +0200 Subject: releasing version 0.1.2-0ubuntu1~ppa2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d0a2212..f55f7fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1.2-0ubuntu1~ppa2) jaunty; urgency=low + + * Autogen failure. + + -- Ted Gould Fri, 13 Mar 2009 09:26:29 +0200 + indicator-applet (0.1.2-0ubuntu1~ppa1) jaunty; urgency=low * Merging in new upstream version 0.1.2 -- cgit v1.2.3 From dab5af7f6bbfdb69e62b8378b6c8770ffe542c06 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 15 Mar 2009 09:11:20 -0500 Subject: Cleaning up the changelog --- debian/changelog | 43 +++++++++---------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index f55f7fb..c1493ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,39 +1,14 @@ -indicator-applet (0.1.2-0ubuntu1~ppa2) jaunty; urgency=low +indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low - * Autogen failure. + * New upstream version + * Removes duplicate prototypes (LP: #338885) + * Fixes background color to match them on dark themes when + the panel color is not set (LP: #334490) + * Removing the handle and replacing it with the ability to + right click on the applet to get a panel menu (LP: #339818) + * Various build fixes - -- Ted Gould Fri, 13 Mar 2009 09:26:29 +0200 - -indicator-applet (0.1.2-0ubuntu1~ppa1) jaunty; urgency=low - - * Merging in new upstream version 0.1.2 - - -- Ted Gould Thu, 12 Mar 2009 19:24:51 +0200 - -indicator-applet (0.1.1-0ubuntu3~ppa3) jaunty; urgency=low - - * debian/control: Adding in gobject-introspection-repository - to pull in GdkPixbuf-2.0.gir. - - -- Ted Gould Wed, 25 Feb 2009 15:47:29 -0600 - -indicator-applet (0.1.1-0ubuntu3~ppa2) jaunty; urgency=low - - * Putting GIR into the install files. - - -- Ted Gould Wed, 25 Feb 2009 14:35:59 -0600 - -indicator-applet (0.1.1-0ubuntu3~ppa1) jaunty; urgency=low - - * Turning on GIR - - -- Ted Gould Wed, 25 Feb 2009 11:16:12 -0600 - -indicator-applet (0.1-0ubuntu3~ppa1) intrepid; urgency=low - - * Pulling in and testing icon changes. - - -- Ted Gould Wed, 18 Feb 2009 14:05:14 -0600 + -- Ted Gould Sun, 15 Mar 2009 08:58:20 -0500 indicator-applet (0.1.1-0ubuntu2) UNRELEASED; urgency=low -- cgit v1.2.3 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(-) 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 0bbf4909324ed0503dfaf7dabf260d2b0cf05349 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 17 Mar 2009 10:50:47 +0100 Subject: retroactively mark 0.1.1-0ubuntu2 as uploaded --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c1493ee..283e2c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low -- Ted Gould Sun, 15 Mar 2009 08:58:20 -0500 -indicator-applet (0.1.1-0ubuntu2) UNRELEASED; urgency=low +indicator-applet (0.1.1-0ubuntu2) jaunty; urgency=low * src/applet-main.c, applet_fill_cb(): Do not show anything if we are running under a stracciatella GNOME session (i. e. without -- cgit v1.2.3 From 2a0f3ae6d2a4492673dee702a02a7f84a147ae15 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 17 Mar 2009 10:51:56 +0100 Subject: Add debian/watch. --- debian/changelog | 6 ++++++ debian/watch | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 283e2c8..35d8580 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low + + * Add debian/watch. + + -- Martin Pitt Tue, 17 Mar 2009 10:51:46 +0100 + indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low * New upstream version diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..e8ab1bd --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/indicator-applet/+download .*/indicator-applet-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From f5f204aa14310950b76a939d80a966f442b7c6d8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 17 Mar 2009 10:54:24 +0100 Subject: Add bzr-builddeb configuration (merge mode). Fortunately this doesn't insist on having *only* debian/ in bzr. This gives us the best of both worlds, bzd-bd auto-downloading orig.tar.gz and merging in the pre-generated autoconf stuff, and retaining the possibility of merging directly from trunk, since we keep the full upstream source in this branch. --- .bzr-builddeb/default.conf | 2 ++ debian/changelog | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 .bzr-builddeb/default.conf diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 0000000..3165e05 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,2 @@ +[BUILDDEB] +merge = True diff --git a/debian/changelog b/debian/changelog index 35d8580..c342d79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low * Add debian/watch. + * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't + insist on having *only* debian/ in bzr. This gives us the best of both + worlds, bzd-bd auto-downloading orig.tar.gz and merging in the + pre-generated autoconf stuff, and retaining the possibility of merging + directly from trunk, since we keep the full upstream source in this branch. -- Martin Pitt Tue, 17 Mar 2009 10:51:46 +0100 -- cgit v1.2.3 From 78eda239bdefc57d766417d48eb46f5a844ab956 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 17 Mar 2009 10:55:22 +0100 Subject: debian/copyright: Fix download location. --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c342d79..de24a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low worlds, bzd-bd auto-downloading orig.tar.gz and merging in the pre-generated autoconf stuff, and retaining the possibility of merging directly from trunk, since we keep the full upstream source in this branch. + * debian/copyright: Fix download location. -- Martin Pitt Tue, 17 Mar 2009 10:51:46 +0100 diff --git a/debian/copyright b/debian/copyright index 9326fc7..074097c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Ted Gould on Wed, 11 Feb 2009 15:41:06 -0600. -It was downloaded from +It was downloaded from Upstream Author: -- cgit v1.2.3 From 4086f8b415719e18b619da74299965466907fa9e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 11:03:51 -0500 Subject: Removing GObject introspection from the build deps --- debian/control | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 5e678b6..fda7679 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,7 @@ Build-Depends: debhelper (>= 5.0), libdbus-glib-1-dev, gnome-doc-utils, libtool, - intltool, - gobject-introspection (>= 0.6), - gobject-introspection-glib-2.0 (>= 0.6), - libgirepository-dev (>= 0.6), - gobject-introspection-repository + intltool Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From b2791c3efdc8915b255dab2bd43126e437ed7d92 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 11:05:36 -0500 Subject: releasing version 0.1.2-0ubuntu3~ted1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index de24a5a..b910efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-applet (0.1.2-0ubuntu3~ted1) jaunty; urgency=low + + * debian/control: Removing GObject introspection + * configure.ac, libindicate/Makefile.am: Making the GObject + introspection optional. + + -- Ted Gould Tue, 17 Mar 2009 11:03:55 -0500 + indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low * Add debian/watch. -- cgit v1.2.3 From 95e61d10ae1acdad145293693003b9de025745d9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 11:28:51 -0500 Subject: releasing version 0.1.2-0ubuntu3~ted1ubuntu1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b910efd..0a44b8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1.2-0ubuntu3~ted1ubuntu1) jaunty; urgency=low + + * PPA version bump. Forgot autogen.sh + + -- Ted Gould Tue, 17 Mar 2009 11:28:38 -0500 + indicator-applet (0.1.2-0ubuntu3~ted1) jaunty; urgency=low * debian/control: Removing GObject introspection -- cgit v1.2.3 From bbf57e6b493628e0dc989cf0b0700e737ef8e0d0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 11:29:15 -0500 Subject: releasing version 0.1.2-0ubuntu3~ted2 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0a44b8b..40f817b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.1.2-0ubuntu3~ted1ubuntu1) jaunty; urgency=low +indicator-applet (0.1.2-0ubuntu3~ted2) jaunty; urgency=low * PPA version bump. Forgot autogen.sh -- 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(-) 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 3cb0dc3da8d81d3b86a791dca779a18a68e50e7a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 13:40:36 -0500 Subject: releasing version 0.1.2-0ubuntu3~ted3 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 40f817b..d24c5f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.1.2-0ubuntu3~ted3) jaunty; urgency=low + + * New version from upstream with explicitly disabling the + gobject introspection stuff. + + -- Ted Gould Tue, 17 Mar 2009 13:40:01 -0500 + indicator-applet (0.1.2-0ubuntu3~ted2) jaunty; urgency=low * PPA version bump. Forgot autogen.sh -- cgit v1.2.3 From 6c97fee7327796c723860b77140cb7ad0ee5f758 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 19:45:03 -0500 Subject: releasing version 0.1.2-0ubuntu3~ted4 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d24c5f8..4c48edd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1.2-0ubuntu3~ted4) jaunty; urgency=low + + * Version bump for PPA. No more bzr builddeb. Evil. + + -- Ted Gould Tue, 17 Mar 2009 19:44:40 -0500 + indicator-applet (0.1.2-0ubuntu3~ted3) jaunty; urgency=low * New version from upstream with explicitly disabling the -- cgit v1.2.3 From 345e246f0c3fd9f02506cc55dd13a32edb3bea33 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 18 Mar 2009 00:17:00 -0500 Subject: Cleaning up Changelog --- debian/changelog | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c48edd..4217bc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,29 +1,11 @@ -indicator-applet (0.1.2-0ubuntu3~ted4) jaunty; urgency=low - - * Version bump for PPA. No more bzr builddeb. Evil. - - -- Ted Gould Tue, 17 Mar 2009 19:44:40 -0500 - -indicator-applet (0.1.2-0ubuntu3~ted3) jaunty; urgency=low - - * New version from upstream with explicitly disabling the - gobject introspection stuff. - - -- Ted Gould Tue, 17 Mar 2009 13:40:01 -0500 - -indicator-applet (0.1.2-0ubuntu3~ted2) jaunty; urgency=low - - * PPA version bump. Forgot autogen.sh - - -- Ted Gould Tue, 17 Mar 2009 11:28:38 -0500 - -indicator-applet (0.1.2-0ubuntu3~ted1) jaunty; urgency=low +indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low + * New upstream version 0.1.3, makes the GObject introspection + an optional build item. * debian/control: Removing GObject introspection - * configure.ac, libindicate/Makefile.am: Making the GObject - introspection optional. + * debian/*.install, remove all of GIR references - -- Ted Gould Tue, 17 Mar 2009 11:03:55 -0500 + -- Ted Gould Wed, 18 Mar 2009 00:12:30 -0500 indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low -- cgit v1.2.3 From ec4b835dcdeea39f4aa97dcb9c39b8fe831c859c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 25 Mar 2009 11:25:19 +0100 Subject: debian/control: Add dependency to indicator-messages; the applet is currently fairly useless without it. (LP: #346359) --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4217bc8..2be1034 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.1.3-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: Add dependency to indicator-messages; the applet is + currently fairly useless without it. (LP: #346359) + + -- Martin Pitt Wed, 25 Mar 2009 11:24:32 +0100 + indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low * New upstream version 0.1.3, makes the GObject introspection diff --git a/debian/control b/debian/control index fda7679..6ca0080 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,8 @@ Package: indicator-applet Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - gnome-panel + 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. -- cgit v1.2.3 From 9e0aabb84ac83a1f20c30756f268d1a06abbbc58 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 25 Mar 2009 11:25:37 +0100 Subject: releasing version 0.1.3-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2be1034..f5dc0ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.1.3-0ubuntu2) UNRELEASED; urgency=low +indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low * debian/control: Add dependency to indicator-messages; the applet is currently fairly useless without it. (LP: #346359) - -- Martin Pitt Wed, 25 Mar 2009 11:24:32 +0100 + -- Martin Pitt Wed, 25 Mar 2009 11:25:29 +0100 indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From ef07f3685c1a0cc6a8b54d922055b385eb20960b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 27 Mar 2009 23:38:21 -0500 Subject: * New upstream version * Changing the text in the license box to make sense. (LP: #346215) * Call GNOME Program Init to initialize all of the ATK and gettext stuff that needs to be initialized for it all to work. Patch from Eitan Isaacson. (LP: #349031) * Give the indicator applet an ATK name so it can be found by the accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031) * Making it so the 'No Indicators' situation uses a label instead of a desensitized menu item to allow right click through. (LP: #346359) * Remove the making of 'Indicator Applet Factory' translatable. (LP: #349540) * Make sure translations get loaded and make the 'No Indicators' error and the license translatable. Patch from Gabor Kelemen. (LP: #349998) --- debian/changelog | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/debian/changelog b/debian/changelog index f5dc0ba..c905356 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low + + * New upstream version + * Changing the text in the license box to make sense. (LP: #346215) + * Call GNOME Program Init to initialize all of the ATK and gettext + stuff that needs to be initialized for it all to work. Patch from + Eitan Isaacson. (LP: #349031) + * Give the indicator applet an ATK name so it can be found by the + accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031) + * Making it so the 'No Indicators' situation uses a label instead of a + desensitized menu item to allow right click through. (LP: #346359) + * Remove the making of 'Indicator Applet Factory' translatable. + (LP: #349540) + * Make sure translations get loaded and make the 'No Indicators' error + and the license translatable. Patch from Gabor Kelemen. (LP: #349998) + + -- Ted Gould Fri, 27 Mar 2009 23:36:00 -0500 + indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low * debian/control: Add dependency to indicator-messages; the applet is -- cgit v1.2.3 From 3e8de8a4ff6a37fc89f9374c2a78402fa08390a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 27 Mar 2009 23:39:31 -0500 Subject: debian/control: Adding libgnomeui-dev as a dependency as it was added upstream. --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index c905356..7b28572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low (LP: #349540) * Make sure translations get loaded and make the 'No Indicators' error and the license translatable. Patch from Gabor Kelemen. (LP: #349998) + * debian/control: Adding libgnomeui-dev as a dependency as it was added + upstream. -- Ted Gould Fri, 27 Mar 2009 23:36:00 -0500 diff --git a/debian/control b/debian/control index 6ca0080..7fb1784 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0), libpanel-applet2-dev (>= 2.0.0), libdbus-glib-1-dev, gnome-doc-utils, + libgnomeui-dev, libtool, intltool Standards-Version: 3.8.0 -- cgit v1.2.3 From 9a1d935149a055969ae18dc5d80fb0ab11071f30 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 27 Mar 2009 23:42:04 -0500 Subject: Now in jaunty --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b28572..608d3f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low * New upstream version * Changing the text in the license box to make sense. (LP: #346215) @@ -16,7 +16,7 @@ indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low * debian/control: Adding libgnomeui-dev as a dependency as it was added upstream. - -- Ted Gould Fri, 27 Mar 2009 23:36:00 -0500 + -- Ted Gould Fri, 27 Mar 2009 23:41:21 -0500 indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low -- cgit v1.2.3 From 4134dd03ae290419bfab493afc8c71ceab9a5d75 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 30 Mar 2009 09:31:49 +0200 Subject: releasing version 0.1.4-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7fc4bfb..656a529 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low * New upstream version * Changing the text in the license box to make sense. (LP: #346215) @@ -16,7 +16,7 @@ indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low * debian/control: Adding libgnomeui-dev as a dependency as it was added upstream. - -- Ted Gould Fri, 27 Mar 2009 23:41:21 -0500 + -- Ted Gould Mon, 30 Mar 2009 09:31:44 +0200 indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low -- cgit v1.2.3 From 76c68f9ff31101db8742903898a61b4e13e7a185 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Apr 2009 12:50:10 -0500 Subject: Merging in dev stuff. This'll break things. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 608d3f5..d1c0928 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.1.4-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * Merging in dev stuff. This'll break things. + + -- Ted Gould Fri, 03 Apr 2009 12:49:33 -0500 + indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low * New upstream version -- cgit v1.2.3 From f252656bda80c42b5c2b2ad43e23330c6dd23ddb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Apr 2009 15:09:55 -0500 Subject: Header fixes --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1c0928..2654182 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -indicator-applet (0.1.4-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-applet (0.1.4-0ubuntu2~ppa2) UNRELEASED; urgency=low * Merging in dev stuff. This'll break things. + * Header fixes - -- Ted Gould Fri, 03 Apr 2009 12:49:33 -0500 + -- Ted Gould Fri, 03 Apr 2009 15:09:33 -0500 indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 0b820c7c122f5eb915e8f58e60139c132c36cd88 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Apr 2009 15:45:35 -0500 Subject: Moving the install file. --- debian/libindicate0.install | 1 - debian/libindicate1.install | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 debian/libindicate0.install create mode 100644 debian/libindicate1.install diff --git a/debian/libindicate0.install b/debian/libindicate0.install deleted file mode 100644 index 0618a58..0000000 --- a/debian/libindicate0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicate.so.* diff --git a/debian/libindicate1.install b/debian/libindicate1.install new file mode 100644 index 0000000..0618a58 --- /dev/null +++ b/debian/libindicate1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate.so.* -- cgit v1.2.3 From b2d85cfc799b8583d859a2796b0040f9a30cf3f8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Apr 2009 22:12:15 -0500 Subject: * debian/libindicate0.install changed to debian/libindicate1.install * New upstream version: * Adds new API for detecting interests of various listeners. Implemented on both client and server side. (LP: 353112) --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 685e9a2..1817e63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ indicator-applet (0.1.4-0ubuntu2~ppa2) UNRELEASED; urgency=low - * Merging in dev stuff. This'll break things. - * Header fixes - * Fixes for dev stuff. * debian/control: Switching libindicate0 to libindicate1 to express the fact that the binary compatibility is broken. + * debian/libindicate0.install changed to debian/libindicate1.install + * New upstream version: + * Adds new API for detecting interests of various listeners. Implemented + on both client and server side. (LP: 353112) -- Ted Gould Fri, 03 Apr 2009 15:09:33 -0500 -- cgit v1.2.3 From 13aa4e53918e0dc6cbc90e01ce0297ad18bc6aaf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Apr 2009 22:17:11 -0500 Subject: on both client and server side. (LP: #353112) * Makes it so that all objects down to the menu now use the gtkstyle naming from FUSA to ensure that they all pick up the theme hacks that are set for FUSA. (LP: #334490) --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1817e63..3cad80c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,10 @@ indicator-applet (0.1.4-0ubuntu2~ppa2) UNRELEASED; urgency=low * debian/libindicate0.install changed to debian/libindicate1.install * New upstream version: * Adds new API for detecting interests of various listeners. Implemented - on both client and server side. (LP: 353112) + on both client and server side. (LP: #353112) + * Makes it so that all objects down to the menu now use the gtkstyle + naming from FUSA to ensure that they all pick up the theme hacks that + are set for FUSA. (LP: #334490) -- Ted Gould Fri, 03 Apr 2009 15:09:33 -0500 -- cgit v1.2.3 From 2ffebacdb64f0019eab4b45ce677c6de549f5a83 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Apr 2009 22:26:07 -0500 Subject: Explicitly sets the about window's window icon. (LP: #356437) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 3cad80c..fe04a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ indicator-applet (0.1.4-0ubuntu2~ppa2) UNRELEASED; urgency=low * Makes it so that all objects down to the menu now use the gtkstyle naming from FUSA to ensure that they all pick up the theme hacks that are set for FUSA. (LP: #334490) + * Explicitly sets the about window's window icon. (LP: #356437) -- Ted Gould Fri, 03 Apr 2009 15:09:33 -0500 -- cgit v1.2.3 From 746b6aa32390dc97bebf371f5b36b2fa24a288c6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Apr 2009 23:08:20 -0500 Subject: Cleaning up changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 55de499..efec7b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.1.4-0ubuntu2~ppa2) UNRELEASED; urgency=low +indicator-applet (0.1.5-0ubuntu1) UNRELEASED; urgency=low * debian/control: Switching libindicate0 to libindicate1 to express the fact that the binary compatibility is broken. -- cgit v1.2.3 From d10264bc6f04f75ec0c48643c68d0179cd3ffc70 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 14 Apr 2009 11:36:17 +0200 Subject: releasing version 0.1.6-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40955cd..8c77adb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-applet (0.1.6-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.1.6-0ubuntu1) jaunty; urgency=low * New upstream version * Applied the same fixes as Cody Russell's patch to indicator-messages to the finalize functions here. Should fix LP: #359018 completely. * Minor warnings fixes in search of solution to above. - -- Ted Gould Mon, 13 Apr 2009 11:29:58 -0500 + -- Ted Gould Tue, 14 Apr 2009 11:36:12 +0200 indicator-applet (0.1.5-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 6465b8b734bb4ef825b518cc5f1397b6ba1bcf17 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Apr 2009 20:42:26 -0500 Subject: * debian/control: Add in package libindicator-dev * debian/libindicate-dev.install: Add greater specificity on what gets installed to not get confused with files from libindicator * debian/libindicator-dev.install: Specify which files should be put into the development package. --- debian/changelog | 5 +++++ debian/control | 12 ++++++++++++ debian/libindicate-dev.install | 4 ++-- debian/libindicator-dev.install | 2 ++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian/libindicator-dev.install diff --git a/debian/changelog b/debian/changelog index 8496552..1a1dc4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ indicator-applet (0.2.0~bzr298-0ubuntu1) UNRELEASED; urgency=low * Upstream snapshot + * debian/control: Add in package libindicator-dev + * debian/libindicate-dev.install: Add greater specificity on what + gets installed to not get confused with files from libindicator + * debian/libindicator-dev.install: Specify which files should be + put into the development package. -- Ted Gould Tue, 21 Apr 2009 17:06:18 -0500 diff --git a/debian/control b/debian/control index d269a2d..9a734c5 100644 --- a/debian/control +++ b/debian/control @@ -54,3 +54,15 @@ Description: GNOME panel indicator applet - shared library various applications consistently in the GNOME panel. . This package contains files that are needed to build applications. + +Package: libindicator-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk2.0-dev (>= 2.12.0) +Description: GNOME panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install index 4623919..ba86036 100644 --- a/debian/libindicate-dev.install +++ b/debian/libindicate-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/ -debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/include/libindicate* +debian/tmp/usr/lib/pkgconfig/indicate.pc debian/tmp/usr/lib/libindicate.a debian/tmp/usr/lib/libindicate.so diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install new file mode 100644 index 0000000..7e7d9db --- /dev/null +++ b/debian/libindicator-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/libindicator* +debian/tmp/usr/lib/pkgconfig/indicator.pc -- cgit v1.2.3 From 74a29536b81b8aa54f418078b8a4c39489d6bf5f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Apr 2009 20:45:05 -0500 Subject: * debian/control: * Add in package libindicator-dev * Add build depends on libxml2-dev for upstream dep --- debian/changelog | 4 +++- debian/control | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a1dc4a..3134406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ indicator-applet (0.2.0~bzr298-0ubuntu1) UNRELEASED; urgency=low * Upstream snapshot - * debian/control: Add in package libindicator-dev + * debian/control: + * Add in package libindicator-dev + * Add build depends on libxml2-dev for upstream dep * debian/libindicate-dev.install: Add greater specificity on what gets installed to not get confused with files from libindicator * debian/libindicator-dev.install: Specify which files should be diff --git a/debian/control b/debian/control index 9a734c5..9595fc5 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, libgnomeui-dev, libtool, - intltool + intltool, + libxml2-dev Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From a380678055fe330d8d8b44e247d0b92eb5fc90c2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Apr 2009 22:31:30 -0500 Subject: releasing version 0.2.0~bzr298-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3134406..80ab70d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.2.0~bzr298-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr298-0ubuntu1) jaunty; urgency=low * Upstream snapshot * debian/control: @@ -9,7 +9,7 @@ indicator-applet (0.2.0~bzr298-0ubuntu1) UNRELEASED; urgency=low * debian/libindicator-dev.install: Specify which files should be put into the development package. - -- Ted Gould Tue, 21 Apr 2009 17:06:18 -0500 + -- Ted Gould Tue, 21 Apr 2009 22:31:23 -0500 indicator-applet (0.1.6-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From d332ad5b67b7354881895420c6d79a373295dc45 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 14:52:19 -0500 Subject: releasing version 0.2.0~bzr299-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0c525c..9900468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr299-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr299-0ubuntu1) jaunty; urgency=low * Upstream snapshot, forgot a + on GTK - -- Ted Gould Wed, 22 Apr 2009 14:48:56 -0500 + -- Ted Gould Wed, 22 Apr 2009 14:52:11 -0500 indicator-applet (0.2.0~bzr298-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From adfd764df668d34c553d49ad1f277153749ac004 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 15:23:20 -0500 Subject: releasing version 0.2.0~bzr300-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94dabc8..c9bf8b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr300-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr300-0ubuntu1) jaunty; urgency=low * Upstream snapshot, fixing indicator.h - -- Ted Gould Wed, 22 Apr 2009 15:22:52 -0500 + -- Ted Gould Wed, 22 Apr 2009 15:23:15 -0500 indicator-applet (0.2.0~bzr299-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From f5044ea680421a572394ea8286b538857d491973 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 15:56:02 -0500 Subject: releasing version 0.2.0~bzr301-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 880d059..5b759b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr301-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr301-0ubuntu1) jaunty; urgency=low * Upstream snapshot, fixing indicator.h - -- Ted Gould Wed, 22 Apr 2009 15:55:33 -0500 + -- Ted Gould Wed, 22 Apr 2009 15:55:55 -0500 indicator-applet (0.2.0~bzr300-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From e1eb7c8f66e217ee7c98c49347cf1d333c96808b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 17:09:11 -0500 Subject: releasing version 0.2.0~bzr302-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1bb92d..33c2405 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.2.0~bzr302-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr302-0ubuntu1) jaunty; urgency=low * Upstream snapshot, turning version getting feature into a function and adding a name symbol outline. - -- Ted Gould Wed, 22 Apr 2009 17:08:29 -0500 + -- Ted Gould Wed, 22 Apr 2009 17:09:07 -0500 indicator-applet (0.2.0~bzr301-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 183d218f7c7d22da792b90c0014d44b088d91008 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 23:46:48 -0500 Subject: releasing version 0.2.0~bzr305-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1252dc9..b51b603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.2.0~bzr305-0ubuntu2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr305-0ubuntu1) jaunty; urgency=low * Upstream snapshot * debian/control: @@ -9,7 +9,7 @@ indicator-applet (0.2.0~bzr305-0ubuntu2) UNRELEASED; urgency=low * debian/libindicator-dev.install: Specify which files should be put into the development package. - -- Ted Gould Wed, 22 Apr 2009 23:45:27 -0500 + -- Ted Gould Wed, 22 Apr 2009 23:46:28 -0500 indicator-applet (0.1.6-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 60e4ddeb21827772b883987dc79bfdfda9b78fe6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 27 Apr 2009 10:51:25 -0500 Subject: debian/control: Adding a build-dep on dbus-test-runner --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 11bdc8c..6d3043d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ indicator-applet (0.2.0~bzr307-0ubuntu1) UNRELEASED; urgency=low * Upstream Snapshot: Adding in a test suite. + * debian/control: Adding a build-dep on dbus-test-runner -- Ted Gould Mon, 27 Apr 2009 10:50:10 -0500 diff --git a/debian/control b/debian/control index 9595fc5..f663d47 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 5.0), libgnomeui-dev, libtool, intltool, - libxml2-dev + libxml2-dev, + dbus-test-runner Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From d8582f740476fdf911e798527b4aec19c75b6a6f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 27 Apr 2009 10:52:33 -0500 Subject: releasing version 0.2.0~bzr307-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d3043d..48bb7d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.2.0~bzr307-0ubuntu1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr307-0ubuntu1) jaunty; urgency=low * Upstream Snapshot: Adding in a test suite. * debian/control: Adding a build-dep on dbus-test-runner - -- Ted Gould Mon, 27 Apr 2009 10:50:10 -0500 + -- Ted Gould Mon, 27 Apr 2009 10:52:28 -0500 indicator-applet (0.2.0~bzr305-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From f6f7c27435c75cd775f011792503b7458311ca3e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 27 Apr 2009 11:06:42 -0500 Subject: Increment for PPA. Forgot to autogen.sh --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 48bb7d4..3d8e42a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr307-0ubuntu2) UNRELEASED; urgency=low + + * Increment for PPA. Forgot to autogen.sh + + -- Ted Gould Mon, 27 Apr 2009 11:06:28 -0500 + indicator-applet (0.2.0~bzr307-0ubuntu1) jaunty; urgency=low * Upstream Snapshot: Adding in a test suite. -- cgit v1.2.3 From f6767c860ee574c964bc7b9bc74affda52f941a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 27 Apr 2009 11:06:50 -0500 Subject: releasing version 0.2.0~bzr307-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d8e42a..c63e92c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr307-0ubuntu2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr307-0ubuntu2) jaunty; urgency=low * Increment for PPA. Forgot to autogen.sh - -- Ted Gould Mon, 27 Apr 2009 11:06:28 -0500 + -- Ted Gould Mon, 27 Apr 2009 11:06:45 -0500 indicator-applet (0.2.0~bzr307-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 10e51643f04368de99bebfafc0b995339fceed73 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 13 May 2009 13:25:33 -0400 Subject: Added package libindicate-doc and removed dbus-test-runner build requirement --- debian/control | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index f663d47..47b903a 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 5.0), libgnomeui-dev, libtool, intltool, - libxml2-dev, - dbus-test-runner + libxml2-dev Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu @@ -68,3 +67,18 @@ Description: GNOME panel indicator applet - shared library the indicator applet. . This package contains files that are needed to build applications. + +Package: libindicate-doc +Section: doc +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate1 (= ${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. + -- cgit v1.2.3 From f36cc1b4db4ecc24dfa68cef6882c893807c8844 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 13 May 2009 14:52:04 -0400 Subject: added debian/libindicate-doc.install --- debian/libindicate-doc.install | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/libindicate-doc.install diff --git a/debian/libindicate-doc.install b/debian/libindicate-doc.install new file mode 100644 index 0000000..55af9eb --- /dev/null +++ b/debian/libindicate-doc.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/gtk-doc/html/libindicate/* +debian/tmp/usr/share/doc/indicator-applet/examples/* -- cgit v1.2.3 From c594f600938184e475841a483e5e87ccb0b1e490 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Jul 2009 21:24:00 -0500 Subject: releasing version 0.2.0~bzr309-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3689fe6..5913f0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.2.0~bzr309-0ubuntu2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu2) jaunty; urgency=low * debian/control, debian/libindicate-doc.install: Merging in Ken Vandine's work on making a -doc package for libindicate. - -- Ted Gould Wed, 13 May 2009 15:00:18 -0500 + -- Ted Gould Fri, 17 Jul 2009 21:23:41 -0500 indicator-applet (0.2.0~bzr309-0ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 61730d0afa4d46e9e85cd1f0795bb891609b4c29 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Jul 2009 21:24:31 -0500 Subject: Now moving on to Karmic --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5913f0b..f66659c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr309-0ubuntu3) UNRELEASED; urgency=low + + * Now moving on to Karmic + + -- Ted Gould Fri, 17 Jul 2009 21:24:11 -0500 + indicator-applet (0.2.0~bzr309-0ubuntu2) jaunty; urgency=low * debian/control, debian/libindicate-doc.install: Merging in Ken -- cgit v1.2.3 From 064740bd411abe73a67a9c75f469f04d8259afdb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Jul 2009 21:24:56 -0500 Subject: releasing version 0.2.0~bzr309-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f66659c..a412e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr309-0ubuntu3) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low * Now moving on to Karmic - -- Ted Gould Fri, 17 Jul 2009 21:24:11 -0500 + -- Ted Gould Fri, 17 Jul 2009 21:24:41 -0500 indicator-applet (0.2.0~bzr309-0ubuntu2) jaunty; urgency=low -- cgit v1.2.3 From 84f000268db92a3070b223c956f07dac729c4703 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 00:27:09 +0100 Subject: * debian/control: * Changing the version number of libindcate to 2 to match the .so numbering. * Creating packages for libindicate-gtk --- debian/changelog | 8 ++++++-- debian/control | 27 ++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c05a0c0..a33afbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -indicator-applet (0.2.0~bzr309-0ubuntu4~ppa1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) UNRELEASED; urgency=low * Merging in upstream code to split out libindicate-gtk + * debian/control: + * Changing the version number of libindcate to 2 to match + the .so numbering. + * Creating packages for libindicate-gtk - -- Ted Gould Tue, 04 Aug 2009 00:22:33 +0100 + -- Ted Gould Tue, 04 Aug 2009 00:26:22 +0100 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low diff --git a/debian/control b/debian/control index 47b903a..f755f70 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Description: GNOME panel indicator applet Currently this includes support for messaging applications in the indicator-messages package. -Package: libindicate1 +Package: libindicate2 Section: libs Conflicts: libindicate Replaces: libindicate @@ -48,6 +48,31 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicate1 (= ${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-gtk (= ${binary:Version}), + libindicate-dev, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: GNOME panel indicator applet - shared library -- cgit v1.2.3 From 8bed775cad9602ebdc02384ecb20d72207c3bf51 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 00:32:09 +0100 Subject: * Added libindicate-gtk-dev.install and libindicate-gtk0.install for the new library. * Renamed libindicate1.install to libindicate2.install to match the package name change. * Modified libindicate-dev to be more specific about the header files that it grabs. --- debian/changelog | 12 +++++++++--- debian/libindicate-dev.install | 2 +- debian/libindicate-gtk-dev.install | 4 ++++ debian/libindicate-gtk0.install | 1 + debian/libindicate1.install | 1 - debian/libindicate2.install | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 debian/libindicate-gtk-dev.install create mode 100644 debian/libindicate-gtk0.install delete mode 100644 debian/libindicate1.install create mode 100644 debian/libindicate2.install diff --git a/debian/changelog b/debian/changelog index a33afbf..361e01a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ -indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa3) UNRELEASED; urgency=low * Merging in upstream code to split out libindicate-gtk * debian/control: * Changing the version number of libindcate to 2 to match the .so numbering. * Creating packages for libindicate-gtk - - -- Ted Gould Tue, 04 Aug 2009 00:26:22 +0100 + * Added libindicate-gtk-dev.install and libindicate-gtk0.install + for the new library. + * Renamed libindicate1.install to libindicate2.install to match + the package name change. + * Modified libindicate-dev to be more specific about the header + files that it grabs. + + -- Ted Gould Tue, 04 Aug 2009 00:30:55 +0100 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install index ba86036..81e1396 100644 --- a/debian/libindicate-dev.install +++ b/debian/libindicate-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicate* +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-gtk-dev.install b/debian/libindicate-gtk-dev.install new file mode 100644 index 0000000..5f0e682 --- /dev/null +++ b/debian/libindicate-gtk-dev.install @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..fc6b412 --- /dev/null +++ b/debian/libindicate-gtk0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate-gtk.so.* diff --git a/debian/libindicate1.install b/debian/libindicate1.install deleted file mode 100644 index 0618a58..0000000 --- a/debian/libindicate1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicate.so.* diff --git a/debian/libindicate2.install b/debian/libindicate2.install new file mode 100644 index 0000000..0618a58 --- /dev/null +++ b/debian/libindicate2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate.so.* -- cgit v1.2.3 From be06bcb9e5e08a03f8455b3ff8b4db04570ed2a0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 01:31:34 +0100 Subject: releasing version 0.2.0~bzr309-0ubuntu4~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 361e01a..8e40a75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.2.0~bzr309-0ubuntu4~ppa3) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa1) karmic; urgency=low * Merging in upstream code to split out libindicate-gtk * debian/control: @@ -12,7 +12,7 @@ indicator-applet (0.2.0~bzr309-0ubuntu4~ppa3) UNRELEASED; urgency=low * Modified libindicate-dev to be more specific about the header files that it grabs. - -- Ted Gould Tue, 04 Aug 2009 00:30:55 +0100 + -- Ted Gould Tue, 04 Aug 2009 01:31:20 +0100 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low -- cgit v1.2.3 From 54b4e00a4cfb33377a4fcbfa550c2fe9f098697f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 01:36:30 +0100 Subject: debian/control: Fixing some libindicate1's that should be libindicate2 and making everything dependent on the versions that are built here in the package. --- debian/changelog | 8 ++++++++ debian/control | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e40a75..32fb168 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) UNRELEASED; urgency=low + + * debian/control: Fixing some libindicate1's that should be + libindicate2 and making everything dependent on the versions + that are built here in the package. + + -- Ted Gould Tue, 04 Aug 2009 01:35:47 +0100 + indicator-applet (0.2.0~bzr309-0ubuntu4~ppa1) karmic; urgency=low * Merging in upstream code to split out libindicate-gtk diff --git a/debian/control b/debian/control index f755f70..92c60a7 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate1 (= ${binary:Version}), + 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 @@ -72,7 +72,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicate-gtk (= ${binary:Version}), - libindicate-dev, + libindicate-dev (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: GNOME panel indicator applet - shared library @@ -98,7 +98,8 @@ Section: doc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate1 (= ${binary:Version}), + 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 -- cgit v1.2.3 From 63ed0ba9f0de5d60f31e5c52849cb6fb7a070cd9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 01:38:29 +0100 Subject: releasing version 0.2.0~bzr309-0ubuntu4~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32fb168..c1b04d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) karmic; urgency=low * debian/control: Fixing some libindicate1's that should be libindicate2 and making everything dependent on the versions that are built here in the package. - -- Ted Gould Tue, 04 Aug 2009 01:35:47 +0100 + -- Ted Gould Tue, 04 Aug 2009 01:38:26 +0100 indicator-applet (0.2.0~bzr309-0ubuntu4~ppa1) karmic; urgency=low -- cgit v1.2.3 From 541c9b2a0654978a99f4bad34d68860b7137149a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 10:27:44 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb68def..45af68f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) karmic; urgency=low * Merging in upstream code to split out libindicate-gtk * debian/control: @@ -12,7 +12,7 @@ indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) UNRELEASED; urgency=low * Modified libindicate-dev to be more specific about the header files that it grabs. - -- Ted Gould Tue, 04 Aug 2009 10:26:02 +0100 + -- Ted Gould Tue, 04 Aug 2009 10:27:31 +0100 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low -- cgit v1.2.3 From 64034ddad824b488b2af230eb975339c1bb2b107 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 10:51:33 +0100 Subject: Forgot to autogen.sh --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 45af68f..1d2982b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * Forgot to autogen.sh + + -- Ted Gould Tue, 04 Aug 2009 10:51:09 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) karmic; urgency=low * Merging in upstream code to split out libindicate-gtk -- cgit v1.2.3 From 96ace70f64b79b9e9bba1b2027ef40cf0b235381 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 10:52:00 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d2982b..8a58fb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) karmic; urgency=low * Forgot to autogen.sh - -- Ted Gould Tue, 04 Aug 2009 10:51:09 +0100 + -- Ted Gould Tue, 04 Aug 2009 10:51:47 +0100 indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From 41c535b370fe6eb2429cbcdcb4d4ecb83833037c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 10:53:46 +0100 Subject: debian/control: Fixing the library reference of libindicate-gtk-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8a58fb5..095e35d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * debian/control: Fixing the library reference of + libindicate-gtk-dev + + -- Ted Gould Tue, 04 Aug 2009 10:53:19 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) karmic; urgency=low * Forgot to autogen.sh diff --git a/debian/control b/debian/control index 92c60a7..23e0158 100644 --- a/debian/control +++ b/debian/control @@ -71,7 +71,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate-gtk (= ${binary:Version}), + libindicate-gtk0 (= ${binary:Version}), libindicate-dev (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) -- cgit v1.2.3 From 72093e20ec97eded81ffc84c3cb45fcf9e14acff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 10:53:52 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 095e35d..c728881 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) karmic; urgency=low * debian/control: Fixing the library reference of libindicate-gtk-dev - -- Ted Gould Tue, 04 Aug 2009 10:53:19 +0100 + -- Ted Gould Tue, 04 Aug 2009 10:53:48 +0100 indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) karmic; urgency=low -- cgit v1.2.3 From 42ba02f7916c1f77f7fb33c4c8cd7c64729312e5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 12:30:59 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu1~ppa4 --- debian/changelog | 4 +- docs/reference/tmpl/libindicate-unused.sgml | 632 ++++++++++++++++++++++++++++ 2 files changed, 634 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fe3a33..d49dfa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa4) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa4) karmic; urgency=low * Upstream fix to PC file. - -- Ted Gould Tue, 04 Aug 2009 12:25:47 +0100 + -- Ted Gould Tue, 04 Aug 2009 12:29:39 +0100 indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) karmic; urgency=low diff --git a/docs/reference/tmpl/libindicate-unused.sgml b/docs/reference/tmpl/libindicate-unused.sgml index 83a53a7..8f457e2 100644 --- a/docs/reference/tmpl/libindicate-unused.sgml +++ b/docs/reference/tmpl/libindicate-unused.sgml @@ -1,3 +1,383 @@ + + + + + +@object: + + + + + + +@klass: + + + + + + +@object: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@object: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@object: + + + + + + +@klass: + + + + + + +@object: + + + + + + +@klass: + + + + + + +@object: + + + + + + +@klass: + + + + + + +@object: + + + + + + +@indicator: + + + + + + +@server: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@object: + + + + + + +@klass: + + + + + + +@object: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Param1: +@Returns: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@v: + + + + + + +@Returns: + + + + + + +@Returns: + @@ -7,6 +387,20 @@ @key: @data: + + + + + +@Returns: + + + + + + +@Returns: + @@ -21,3 +415,241 @@ @obj: + + + + + +@proxy: +@OUT_indicator_count: +@Returns: + + + + + + +@proxy: +@callback: +@Returns: + + + + + + +@proxy: +@IN_type: +@OUT_indicator_count: +@Returns: + + + + + + +@proxy: +@IN_type: +@callback: +@Returns: + + + + + + +@proxy: +@OUT_indicator_count: +@error: +@userdata: + + + + + + +@proxy: +@OUT_indicator_count: +@error: +@userdata: + + + + + + +@proxy: +@OUT_indicators: +@Returns: + + + + + + +@proxy: +@callback: +@Returns: + + + + + + +@proxy: +@IN_type: +@OUT_indicators: +@Returns: + + + + + + +@proxy: +@IN_type: +@callback: +@Returns: + + + + + + +@proxy: +@OUT_indicators: +@error: +@userdata: + + + + + + +@proxy: +@OUT_indicators: +@error: +@userdata: + + + + + + +@proxy: +@IN_id: +@OUT_properties: +@Returns: + + + + + + +@proxy: +@IN_id: +@callback: +@Returns: + + + + + + +@proxy: +@OUT_properties: +@error: +@userdata: + + + + + + +@proxy: +@IN_id: +@IN_property: +@OUT_value: +@Returns: + + + + + + +@proxy: +@IN_id: +@IN_property: +@callback: +@Returns: + + + + + + +@proxy: +@IN_id: +@IN_properties: +@OUT_values: +@Returns: + + + + + + +@proxy: +@IN_id: +@IN_properties: +@callback: +@Returns: + + + + + + +@proxy: +@OUT_values: +@error: +@userdata: + + + + + + +@proxy: +@OUT_value: +@error: +@userdata: + + + + + + +@proxy: +@IN_id: +@Returns: + + + + + + +@proxy: +@IN_id: +@callback: +@Returns: + + + + + + +@proxy: +@error: +@userdata: + -- cgit v1.2.3 From daaa9a5b435f75e242fef31cd3b436cad5d02943 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Wed, 5 Aug 2009 00:23:53 +0100 Subject: tidy changelog for release --- debian/changelog | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index d49dfa2..a9e5498 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,24 +1,6 @@ -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa4) karmic; urgency=low - - * Upstream fix to PC file. - - -- Ted Gould Tue, 04 Aug 2009 12:29:39 +0100 - -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) karmic; urgency=low - - * debian/control: Fixing the library reference of - libindicate-gtk-dev - - -- Ted Gould Tue, 04 Aug 2009 10:53:48 +0100 - -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) karmic; urgency=low - - * Forgot to autogen.sh - - -- Ted Gould 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 @@ -31,7 +13,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 Tue, 04 Aug 2009 10:27:31 +0100 + -- Jonathan Riddell Wed, 05 Aug 2009 00:22:54 +0100 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low -- cgit v1.2.3 From 07a83fac483904cc7fdfe242c64b3a80968807b5 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Wed, 5 Aug 2009 00:41:16 +0100 Subject: Run ./autogen.sh before upload --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a9e5498..f73f46b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr319-0ubuntu2) karmic; urgency=low + + * Run ./autogen.sh before upload + + -- Jonathan Riddell Wed, 05 Aug 2009 00:40:52 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu1) karmic; urgency=low [ Ted Gould ] -- cgit v1.2.3 From 6a2b4b1719b877ed300f5a2eee1e83096ecad537 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Aug 2009 01:26:47 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu1~ppa5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 977132b..9b06f5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.2.0~bzr319-0ubuntu1~ppa5) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa5) karmic; urgency=low * Upstream fix for server.c and get indicators with hidden indicators in the list. - -- Ted Gould Wed, 05 Aug 2009 01:26:11 +0100 + -- Ted Gould Wed, 05 Aug 2009 01:26:43 +0100 indicator-applet (0.2.0~bzr319-0ubuntu1~ppa4) karmic; urgency=low -- 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(-) 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 8223eb61915a7ee010d4ac754066ea36a1db50e1 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Wed, 5 Aug 2009 11:29:13 +0100 Subject: Add build-dep on gtk-doc-tools --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d2f8ca2..26c8aee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low + + * Add build-dep on gtk-doc-tools + + -- Jonathan Riddell Wed, 05 Aug 2009 11:28:57 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low * debian/rules 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 -- cgit v1.2.3 From 93135b103822476a99a7eeffbdd47c3634d2ba4a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:30:27 +0100 Subject: * debian/control: Adding information on indicator-applet-sus which is a different applet for the SUS indicator. * debian/indicator-applet.install: Making it more specific so that it doesn't grab the directories that now have additional files created by indicator-applet-sus existing. * debian/indicator-applet-sus.install: List files that are now used by the new binary package. --- debian/changelog | 7 +++++++ debian/control | 13 +++++++++++++ debian/indicator-applet-sus.install | 2 ++ debian/indicator-applet.install | 6 +++--- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 debian/indicator-applet-sus.install diff --git a/debian/changelog b/debian/changelog index d64362f..7e94921 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) UNRELEASED; urgency=low * Updating from upstream with two (count them) two applets installed in the source. + * debian/control: Adding information on indicator-applet-sus which + is a different applet for the SUS indicator. + * debian/indicator-applet.install: Making it more specific so that + it doesn't grab the directories that now have additional files + created by indicator-applet-sus existing. + * debian/indicator-applet-sus.install: List files that are now + used by the new binary package. -- Ted Gould Fri, 07 Aug 2009 18:18:17 +0100 diff --git a/debian/control b/debian/control index 4281a15..57cadef 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,19 @@ Description: GNOME panel indicator applet 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 +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 diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install new file mode 100644 index 0000000..6bb7e07 --- /dev/null +++ b/debian/indicator-applet-sus.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorAppletSUS.server +debian/tmp/usr/lib/indicator-applet/indicator-applet-sus diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install index a6e5326..772d432 100644 --- a/debian/indicator-applet.install +++ b/debian/indicator-applet.install @@ -1,4 +1,4 @@ -debian/tmp/etc -debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/indicator-applet +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 -- cgit v1.2.3 From 709f0a835c44065571debf2ff1a9c428aed3a56f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:31:45 +0100 Subject: Locking the version number so the two indicator-applets are the same --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 57cadef..86c1447 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel, - indicator-applet + 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. -- cgit v1.2.3 From 31fac01d9186c896eb683e5888e9d8943795a82e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:40:03 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu5~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e94921..cfabf01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low * Updating from upstream with two (count them) two applets installed in the source. @@ -10,7 +10,7 @@ indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) UNRELEASED; urgency=low * debian/indicator-applet-sus.install: List files that are now used by the new binary package. - -- Ted Gould Fri, 07 Aug 2009 18:18:17 +0100 + -- Ted Gould Fri, 07 Aug 2009 18:39:59 +0100 indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low -- cgit v1.2.3 From e97463ed73f9c8b6004a56315d4403e36bbcf781 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:40:19 +0100 Subject: Upstream merge for better naming of the applet. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cfabf01..e33e0c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) UNRELEASED; urgency=low + + * Upstream merge for better naming of the applet. + + -- Ted Gould Fri, 07 Aug 2009 18:40:07 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low * Updating from upstream with two (count them) two applets -- cgit v1.2.3 From 721b0f9ae27da0727faec06a0add00a384714999 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:40:26 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu5~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e33e0c4..b43ca4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) karmic; urgency=low * Upstream merge for better naming of the applet. - -- Ted Gould Fri, 07 Aug 2009 18:40:07 +0100 + -- Ted Gould Fri, 07 Aug 2009 18:40:22 +0100 indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low -- cgit v1.2.3 From 853ef5b9085fa6167babd0e8ea962666eeab3d7f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:50:37 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu5~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3d7cf1..9e95ed4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) karmic; urgency=low * Renaming the second Bonobo server description file to match that of the FastUserSwitchApplet. - -- Ted Gould Fri, 07 Aug 2009 18:50:02 +0100 + -- Ted Gould Fri, 07 Aug 2009 18:50:33 +0100 indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) karmic; urgency=low -- cgit v1.2.3 From 79d17f5f5018efb0a6db66b48dd9afa7e262a0b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 19:02:23 +0100 Subject: releasing version 0.2.0~bzr319-0ubuntu5~ppa4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1f55bd..7b998cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa4) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa4) karmic; urgency=low * Merging onto the main packaging branch. - -- Ted Gould Fri, 07 Aug 2009 19:01:57 +0100 + -- Ted Gould Fri, 07 Aug 2009 19:02:17 +0100 indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) karmic; urgency=low -- cgit v1.2.3 From dcbb7eba056da11cf575bb2a10fea954440bb0fb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Aug 2009 09:18:22 -0500 Subject: releasing version 0.2.0~bzr319-0ubuntu5~ppa5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a8efee..6b7c86a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa5) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa5) karmic; urgency=low * Setting the icon path in the .pc file. - -- Ted Gould Mon, 17 Aug 2009 09:14:42 -0500 + -- Ted Gould Mon, 17 Aug 2009 09:18:18 -0500 indicator-applet (0.2.0~bzr319-0ubuntu5~ppa4) karmic; urgency=low -- 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 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 0ec3b869b60d7197d6c5f3139bf50844b9957054 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 18 Aug 2009 13:54:50 -0500 Subject: Removing the install file. --- debian/libindicator-dev.install | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/libindicator-dev.install diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install deleted file mode 100644 index 7e7d9db..0000000 --- a/debian/libindicator-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/include/libindicator* -debian/tmp/usr/lib/pkgconfig/indicator.pc -- cgit v1.2.3 From 772dcaf2f46646b80e08804511a1077aadb5d371 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 18 Aug 2009 13:55:03 -0500 Subject: releasing version 0.2.0~bzr325-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 281b0b7..a0cbf86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.2.0~bzr325-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.2.0~bzr325-0ubuntu1~ppa1) karmic; urgency=low * 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 + -- Ted Gould Tue, 18 Aug 2009 13:54:57 -0500 indicator-applet (0.2.0~bzr319-0ubuntu5~ppa5) karmic; urgency=low -- cgit v1.2.3 From 689de8dcc4550a1d579bd8bbd42dc15b47a15386 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 24 Aug 2009 09:00:47 -0400 Subject: New version (LP: #417039) --- debian/changelog | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0cbf86..ad87958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,37 +1,14 @@ -libindicator (0.2.0~bzr325-0ubuntu1~ppa1) karmic; urgency=low +libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] + * New version (LP: #417039) * Merging in the seperation from indicator-applet * debian/* Removing all of the indicator-applet stuff - - -- Ted Gould Tue, 18 Aug 2009 13:54:57 -0500 - -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa5) karmic; urgency=low - * Setting the icon path in the .pc file. - - -- Ted Gould Mon, 17 Aug 2009 09:18:18 -0500 - -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa4) karmic; urgency=low - * Merging onto the main packaging branch. - - -- Ted Gould Fri, 07 Aug 2009 19:02:17 +0100 - -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) karmic; urgency=low - * Renaming the second Bonobo server description file to match that of the FastUserSwitchApplet. - - -- Ted Gould Fri, 07 Aug 2009 18:50:33 +0100 - -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) karmic; urgency=low - * Upstream merge for better naming of the applet. - - -- Ted Gould Fri, 07 Aug 2009 18:40:22 +0100 - -indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low - * Updating from upstream with two (count them) two applets installed in the source. * debian/control: Adding information on indicator-applet-sus which @@ -42,7 +19,7 @@ indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low * debian/indicator-applet-sus.install: List files that are now used by the new binary package. - -- Ted Gould Fri, 07 Aug 2009 18:39:59 +0100 + -- Ken VanDine Mon, 24 Aug 2009 08:59:06 -0400 indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low -- cgit v1.2.3 From 7e26ec7553aca5a7fd4588f0ea6b89d1206bb7ac Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 24 Aug 2009 12:20:28 -0400 Subject: * debian/control: - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop --- debian/changelog | 6 +++++- debian/control | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad87958..e020f46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,11 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low * debian/indicator-applet-sus.install: List files that are now used by the new binary package. - -- Ken VanDine Mon, 24 Aug 2009 08:59:06 -0400 + [ Ken VanDine ] + * debian/control: + - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop + + -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low diff --git a/debian/control b/debian/control index 1c91055..34aea00 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 5.0), libtool Standards-Version: 3.8.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libindicator/ubuntu +Vcs-Bzr: lp:~ubuntu-desktop/libindicator/ubuntu +Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator-dev Section: libdevel -- cgit v1.2.3 From f434a8773ba42d2e9f45e71ddb118580454a5ea2 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 25 Aug 2009 08:32:27 +0200 Subject: Flush changelog. --- debian/changelog | 201 +------------------------------------------------------ 1 file changed, 3 insertions(+), 198 deletions(-) diff --git a/debian/changelog b/debian/changelog index e020f46..4b7cd73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,202 +23,7 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low * debian/control: - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop - -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 - -indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low - - * Add build-dep on gtk-doc-tools - - -- Jonathan Riddell Wed, 05 Aug 2009 11:28:57 +0100 - -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 - - -- Jonathan Riddell Wed, 05 Aug 2009 00:40:52 +0100 - -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 - the .so numbering. - * Creating packages for libindicate-gtk - * Added libindicate-gtk-dev.install and libindicate-gtk0.install - for the new library. - * Renamed libindicate1.install to libindicate2.install to match - the package name change. - * Modified libindicate-dev to be more specific about the header - files that it grabs. - - -- Jonathan Riddell Wed, 05 Aug 2009 00:22:54 +0100 - -indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low - - * Now moving on to Karmic - - -- Ted Gould Fri, 17 Jul 2009 21:24:41 -0500 - -indicator-applet (0.2.0~bzr309-0ubuntu2) jaunty; urgency=low - - * debian/control, debian/libindicate-doc.install: Merging in Ken - Vandine's work on making a -doc package for libindicate. - - -- Ted Gould Fri, 17 Jul 2009 21:23:41 -0500 - -indicator-applet (0.2.0~bzr309-0ubuntu1) jaunty; urgency=low - - * Merge from upstream, includes documentation. - - -- Ted Gould Tue, 05 May 2009 16:44:29 +0100 - -indicator-applet (0.2.0~bzr307-0ubuntu2) jaunty; urgency=low - - * Increment for PPA. Forgot to autogen.sh - - -- Ted Gould Mon, 27 Apr 2009 11:06:45 -0500 - -indicator-applet (0.2.0~bzr307-0ubuntu1) jaunty; urgency=low - - * Upstream Snapshot: Adding in a test suite. - * debian/control: Adding a build-dep on dbus-test-runner - - -- Ted Gould Mon, 27 Apr 2009 10:52:28 -0500 - -indicator-applet (0.2.0~bzr305-0ubuntu1) jaunty; urgency=low - - * Upstream snapshot - * debian/control: - * Add in package libindicator-dev - * Add build depends on libxml2-dev for upstream dep - * debian/libindicate-dev.install: Add greater specificity on what - gets installed to not get confused with files from libindicator - * debian/libindicator-dev.install: Specify which files should be - put into the development package. - - -- Ted Gould Wed, 22 Apr 2009 23:46:28 -0500 - -indicator-applet (0.1.6-0ubuntu1) jaunty; urgency=low - - * New upstream version - * Applied the same fixes as Cody Russell's patch to indicator-messages - to the finalize functions here. Should fix LP: #359018 completely. - * Minor warnings fixes in search of solution to above. - - -- Ted Gould Tue, 14 Apr 2009 11:36:12 +0200 - -indicator-applet (0.1.5-0ubuntu1) jaunty; urgency=low - - * debian/control: Switching libindicate0 to libindicate1 to express - the fact that the binary compatibility is broken. - * debian/libindicate0.install changed to debian/libindicate1.install - * New upstream version: - * Adds new API for detecting interests of various listeners. Implemented - on both client and server side. (LP: #353112) - * Makes it so that all objects down to the menu now use the gtkstyle - naming from FUSA to ensure that they all pick up the theme hacks that - are set for FUSA. (LP: #334490) - * Explicitly sets the about window's window icon. (LP: #356437) - - -- Ted Gould Fri, 03 Apr 2009 15:09:33 -0500 - -indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low - - * New upstream version - * Changing the text in the license box to make sense. (LP: #346215) - * Call GNOME Program Init to initialize all of the ATK and gettext - stuff that needs to be initialized for it all to work. Patch from - Eitan Isaacson. (LP: #349031) - * Give the indicator applet an ATK name so it can be found by the - accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031) - * Making it so the 'No Indicators' situation uses a label instead of a - desensitized menu item to allow right click through. (LP: #346359) - * Remove the making of 'Indicator Applet Factory' translatable. - (LP: #349540) - * Make sure translations get loaded and make the 'No Indicators' error - and the license translatable. Patch from Gabor Kelemen. (LP: #349998) - * debian/control: Adding libgnomeui-dev as a dependency as it was added - upstream. - - -- Ted Gould Mon, 30 Mar 2009 09:31:44 +0200 - -indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low - - * debian/control: Add dependency to indicator-messages; the applet is - currently fairly useless without it. (LP: #346359) - - -- Martin Pitt Wed, 25 Mar 2009 11:25:29 +0100 - -indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low - - * New upstream version 0.1.3, makes the GObject introspection - an optional build item. - * debian/control: Removing GObject introspection - * debian/*.install, remove all of GIR references + [ Martin Pitt ] + * Flush changelog. - -- Ted Gould Wed, 18 Mar 2009 00:12:30 -0500 - -indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low - - * Add debian/watch. - * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't - insist on having *only* debian/ in bzr. This gives us the best of both - worlds, bzd-bd auto-downloading orig.tar.gz and merging in the - pre-generated autoconf stuff, and retaining the possibility of merging - directly from trunk, since we keep the full upstream source in this branch. - * debian/copyright: Fix download location. - - -- Martin Pitt Tue, 17 Mar 2009 10:51:46 +0100 - -indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low - - * New upstream version - * Removes duplicate prototypes (LP: #338885) - * Fixes background color to match them on dark themes when - the panel color is not set (LP: #334490) - * Removing the handle and replacing it with the ability to - right click on the applet to get a panel menu (LP: #339818) - * Various build fixes - - -- Ted Gould Sun, 15 Mar 2009 08:58:20 -0500 - -indicator-applet (0.1.1-0ubuntu2) jaunty; urgency=low - - * src/applet-main.c, applet_fill_cb(): Do not show anything if we - are running under a stracciatella GNOME session (i. e. without - Ubuntu components). See UbuntuSpec:stracciatella-session. - - -- Martin Pitt Thu, 19 Feb 2009 17:24:04 +0100 - -indicator-applet (0.1.1-0ubuntu1) jaunty; urgency=low - - * New upstream release with some icon changes. - * debian/control: Fix Vcs-Bzr. - * debian/control: Update package descriptions; the messaging part is - provided by indicator-messages. - * debian/copyright: Fix leftover word "either" from the license - description. - - -- Martin Pitt Thu, 19 Feb 2009 16:12:01 +0100 - -indicator-applet (0.1-0ubuntu1) jaunty; urgency=low - - * Initial release, based on DX team's PPA packaging branch. - (lp:~indicator-applet-developers/indicator-applet/applet-packaging) - * Repack orig.tar.gz with a copy of the LGPL 3, libindicate/* is - under that license. - * debian/control: Add Homepage:, Vcs-Bzr:, and proper package - descriptions. - * debian/copyright: Properly describe licenses. - * configure.ac: Add missing gio-2.0 pkgconfig check (from DX team - PPA packaging branch), and autoreconf to pick up the change. - - -- Martin Pitt Tue, 17 Feb 2009 10:28:14 +0100 + -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 -- cgit v1.2.3 From 6736e778c98cc72fab060816658bfb8bfd719499 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 25 Aug 2009 08:33:06 +0200 Subject: debian/control: Fix Vcs-* links. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4b7cd73..d0f2967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,5 +25,6 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low [ Martin Pitt ] * Flush changelog. + * debian/control: Fix Vcs-* links. -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 diff --git a/debian/control b/debian/control index 34aea00..9f0f009 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 5.0), libtool Standards-Version: 3.8.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: lp:~ubuntu-desktop/libindicator/ubuntu -Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator-dev Section: libdevel -- cgit v1.2.3 From e5afc8733aa786940e3d1bfc4f338ac7bfa834f4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 25 Aug 2009 08:38:04 +0200 Subject: releasing version 0.2.0~bzr325-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0f2967..62541d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low [ Ted Gould ] * New version (LP: #417039) @@ -27,4 +27,4 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low * Flush changelog. * debian/control: Fix Vcs-* links. - -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 + -- Ken VanDine Tue, 25 Aug 2009 08:35:00 +0200 -- cgit v1.2.3 From 507d19bc1d318700cac6405d33adf1a9ec65952c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Sep 2009 11:05:56 -0500 Subject: releasing version 0.2.0-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2544520..bd8003d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.2.0-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.2.0 - -- Ted Gould Thu, 10 Sep 2009 11:04:31 -0500 + -- Ted Gould Thu, 10 Sep 2009 11:04:54 -0500 libindicator (0.2.0~bzr325-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From 9075de465a7f5be774c9f76089e6e0bd59fb549b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 10 Sep 2009 20:22:38 +0200 Subject: more verbose changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9f26bfa..e014430 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libindicator (0.2.0-0ubuntu1) UNRELEASED; urgency=low - * Upstream release 0.2.0 (LP: #427443) + * Upstream release 0.2.0 (LP: #427443): + - Use silent automake mode. + - Tag for final release. -- Ted Gould Thu, 10 Sep 2009 11:04:54 -0500 -- cgit v1.2.3 From 90bed2928ef6a8c2c471e867f95bda4d4c9c904b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 10 Sep 2009 20:22:50 +0200 Subject: releasing version 0.2.0-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e014430..b4a3dd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.2.0-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.2.0-0ubuntu1) karmic; urgency=low * Upstream release 0.2.0 (LP: #427443): - Use silent automake mode. - Tag for final release. - -- Ted Gould Thu, 10 Sep 2009 11:04:54 -0500 + -- Ted Gould Thu, 10 Sep 2009 20:22:45 +0200 libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 1518975af7ae06693433978c1f749a863ad472af Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 10:17:18 -0400 Subject: releasing version 0.2.1-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25a6af5..1ab8da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.2.1-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.2.1-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.2.1 * Puts a copyright header on the header file. Should have been there all along. - -- Ted Gould Thu, 08 Oct 2009 10:15:56 -0400 + -- Ted Gould Thu, 08 Oct 2009 10:17:16 -0400 libindicator (0.2.0-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 98c7033de5aeaace785f2d597fb39be2ed0a041e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 9 Oct 2009 08:12:31 +0200 Subject: releasing version 0.2.1-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e91f35..d3ca348 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.2.1-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.2.1-0ubuntu1) karmic; urgency=low * Upstream release 0.2.1 (LP: #446619) * Puts a copyright header on the header file. Should have been there all along. - -- Ted Gould Thu, 08 Oct 2009 10:17:16 -0400 + -- Ted Gould Fri, 09 Oct 2009 08:12:18 +0200 libindicator (0.2.0-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 00808f0d8cc647ba6af5da0835d45091ac076daa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 16:39:53 -0600 Subject: * debian/control: Adding a target for libindicator0 * Adding libindicator0.install and libindicator-dev.install --- debian/changelog | 2 ++ debian/control | 11 +++++++++++ debian/libindicator-dev.install | 4 ++++ debian/libindicator0.install | 1 + 4 files changed, 18 insertions(+) create mode 100644 debian/libindicator-dev.install create mode 100644 debian/libindicator0.install diff --git a/debian/changelog b/debian/changelog index f11c653..657c101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libindicator (0.2.1-0ubuntu2~ppa1~sm1) UNRELEASED; urgency=low * Adding in service management code. + * debian/control: Adding a target for libindicator0 + * Adding libindicator0.install and libindicator-dev.install -- Ted Gould Mon, 02 Nov 2009 16:30:36 -0600 diff --git a/debian/control b/debian/control index 9f0f009..6d14ad9 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,17 @@ 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: libindicator0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. + Package: libindicator-dev Section: libdevel Architecture: any diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install new file mode 100644 index 0000000..9b68f17 --- /dev/null +++ b/debian/libindicator-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libindicator-0.1/libindicate/* +debian/tmp/usr/lib/pkgconfig/indicator.pc +debian/tmp/usr/lib/libindicator.a +debian/tmp/usr/lib/libindicator.so diff --git a/debian/libindicator0.install b/debian/libindicator0.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* -- cgit v1.2.3 From a4652e18bcf44f5f58e3cc6e32b36a2a5845cb00 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 16:50:02 -0600 Subject: releasing version 0.2.1-0ubuntu2~ppa1~sm1 --- debian/changelog | 4 ++-- debian/libindicator-dev.install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 657c101..90312a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.2.1-0ubuntu2~ppa1~sm1) UNRELEASED; urgency=low +libindicator (0.2.1-0ubuntu2~ppa1~sm1) karmic; urgency=low * Adding in service management code. * debian/control: Adding a target for libindicator0 * Adding libindicator0.install and libindicator-dev.install - -- Ted Gould Mon, 02 Nov 2009 16:30:36 -0600 + -- Ted Gould Mon, 02 Nov 2009 16:49:57 -0600 libindicator (0.2.1-0ubuntu1) karmic; urgency=low diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index 9b68f17..33d0de9 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicator-0.1/libindicate/* +debian/tmp/usr/include/libindicator-0.1/libindicator/* debian/tmp/usr/lib/pkgconfig/indicator.pc debian/tmp/usr/lib/libindicator.a debian/tmp/usr/lib/libindicator.so -- cgit v1.2.3 From ff0cc74b338c431bfef836aa4e0fc337e48d0296 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 17:15:12 -0600 Subject: releasing version 0.2.1-0ubuntu2~ppa1~sm2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9925ba4..24f3f99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.2.1-0ubuntu2~ppa1~sm2) UNRELEASED; urgency=low +libindicator (0.2.1-0ubuntu2~ppa1~sm2) karmic; urgency=low * Fixing package config file to point to library - -- Ted Gould Mon, 02 Nov 2009 17:12:39 -0600 + -- Ted Gould Mon, 02 Nov 2009 17:15:09 -0600 libindicator (0.2.1-0ubuntu2~ppa1~sm1) karmic; urgency=low -- cgit v1.2.3 From 5ad8e303d608198feb464fb6930d56856f4bda9d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 08:19:04 -0600 Subject: releasing version 0.2.1-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a908ebc..5e99e9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.2.1-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low * Adding in service management code. * debian/control: Adding a target for libindicator0 * Adding libindicator0.install and libindicator-dev.install - -- Ted Gould Wed, 04 Nov 2009 08:14:34 -0600 + -- Ted Gould Wed, 04 Nov 2009 08:19:01 -0600 libindicator (0.2.1-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 2802941acc290d0735754eabeae374af6c72d47e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 13:13:23 -0600 Subject: Changing debian/libindicator-dev.install for the adjusted include path. --- debian/changelog | 2 ++ debian/libindicator-dev.install | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f9e1cdd..8ba5a29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libindicator (0.2.1-0ubuntu2~ppa2~multi1) UNRELEASED; urgency=low * Changing the object interface to allow for multiple items per module. + * Changing debian/libindicator-dev.install for the adjusted + include path. -- Ted Gould Wed, 04 Nov 2009 13:06:39 -0600 diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index 33d0de9..bbdcdeb 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicator-0.1/libindicator/* +debian/tmp/usr/include/libindicator-0.3/libindicator/* debian/tmp/usr/lib/pkgconfig/indicator.pc debian/tmp/usr/lib/libindicator.a debian/tmp/usr/lib/libindicator.so -- cgit v1.2.3 From 77033be1b108a1e8b1d9d7e09218a93e657e707f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 13:16:34 -0600 Subject: releasing version 0.2.1-0ubuntu2~ppa2~multi1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ba5a29..d9916c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.2.1-0ubuntu2~ppa2~multi1) UNRELEASED; urgency=low +libindicator (0.2.1-0ubuntu2~ppa2~multi1) karmic; urgency=low * Changing the object interface to allow for multiple items per module. * Changing debian/libindicator-dev.install for the adjusted include path. - -- Ted Gould Wed, 04 Nov 2009 13:06:39 -0600 + -- Ted Gould Wed, 04 Nov 2009 13:16:25 -0600 libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 15120ed56c5bc4b34d8609dd5ccb84fc0e82776f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 13:17:33 -0600 Subject: Changing version. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d9916c0..2424129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa1~multi1) UNRELEASED; urgency=low + + * Changing version. + + -- Ted Gould Wed, 04 Nov 2009 13:16:40 -0600 + libindicator (0.2.1-0ubuntu2~ppa2~multi1) karmic; urgency=low * Changing the object interface to allow for multiple items -- cgit v1.2.3 From d6901e10e3d1c95a970dfdd35ed0892dbb0b220c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 13:18:22 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa1~multi1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2424129..2992925 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa1~multi1) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa1~multi1) karmic; urgency=low * Changing version. - -- Ted Gould Wed, 04 Nov 2009 13:16:40 -0600 + -- Ted Gould Wed, 04 Nov 2009 13:18:19 -0600 libindicator (0.2.1-0ubuntu2~ppa2~multi1) karmic; urgency=low -- cgit v1.2.3 From 8569ff33a9507aae7f638fe71a48bc6caf51fcc3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 09:16:25 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f1facb8..fee9caf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low * Changing the object interface to allow for multiple items per module. * Changing debian/libindicator-dev.install for the adjusted include path. - -- Ted Gould Thu, 05 Nov 2009 09:14:43 -0600 + -- Ted Gould Thu, 05 Nov 2009 09:16:22 -0600 libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 3177188812f8d9e43ac6d2bb3c8bd1894b5c2e5f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 10:08:29 -0600 Subject: debian/control: Adding build deps for the libraries we're using. Seems we should have done that earlier, eh? --- debian/changelog | 7 +++++++ debian/control | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fee9caf..58651ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * debian/control: Adding build deps for the libraries we're + using. Seems we should have done that earlier, eh? + + -- Ted Gould Thu, 05 Nov 2009 10:08:01 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low * Changing the object interface to allow for multiple items diff --git a/debian/control b/debian/control index 6d14ad9..e0f02d0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,10 @@ Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libtool + libgtk2.0-dev (>= 2.12.0), + libtool, + intltool, + gtk-doc-tools Standards-Version: 3.8.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -- cgit v1.2.3 From 2fb0a49a23785483b89b2f5745f4317d18850666 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 10:09:43 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58651ae..f9e7c99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low * debian/control: Adding build deps for the libraries we're using. Seems we should have done that earlier, eh? - -- Ted Gould Thu, 05 Nov 2009 10:08:01 -0600 + -- Ted Gould Thu, 05 Nov 2009 10:09:39 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From a6c762e20e9042d69069f8fb06272d0a1e5fadb3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 10:25:09 -0600 Subject: debian/control: Adding build deps dbus-glib as well. --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index f9e7c99..53bf327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * debian/control: Adding build deps dbus-glib as well. + + -- Ted Gould Thu, 05 Nov 2009 10:24:54 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low * debian/control: Adding build deps for the libraries we're diff --git a/debian/control b/debian/control index e0f02d0..439dc06 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), + libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -- cgit v1.2.3 From a87ce2822933f558f8e77ec3d32d226f16a62c86 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 10:25:54 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53bf327..32fc922 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low * debian/control: Adding build deps dbus-glib as well. - -- Ted Gould Thu, 05 Nov 2009 10:24:54 -0600 + -- Ted Gould Thu, 05 Nov 2009 10:25:52 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low -- cgit v1.2.3 From a095f059d0b02220054e9ce62b236195689cfcaf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Nov 2009 15:25:07 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e757973..58aa952 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa4) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa4) karmic; urgency=low * 64-bit fix for printf's - -- Ted Gould Mon, 16 Nov 2009 15:24:41 -0600 + -- Ted Gould Mon, 16 Nov 2009 15:25:03 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low -- cgit v1.2.3 From b72113b50eea739f7f99177a474e98ffcc893a09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Nov 2009 15:26:25 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa4 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 58aa952..eeee5c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ libindicator (0.3.0~dev-0ubuntu1~ppa4) karmic; urgency=low * 64-bit fix for printf's - -- Ted Gould Mon, 16 Nov 2009 15:25:03 -0600 + -- Ted Gould Mon, 16 Nov 2009 15:26:23 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low -- cgit v1.2.3 -- cgit v1.2.3 From 18eb9ed646f2655f64ddaccd5e0b4ed9e28db026 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 17 Nov 2009 14:06:59 +1100 Subject: Depend on libindicator0 to pull it in when libindicator-dev is a build-dep. --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eeee5c1..4d2e75a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa5) karmic; urgency=low + + * Depend on libindicator0 to pull it in when libindicator-dev is a build-dep. + + -- Robert Collins Tue, 17 Nov 2009 14:06:00 +1100 + libindicator (0.3.0~dev-0ubuntu1~ppa4) karmic; urgency=low * 64-bit fix for printf's diff --git a/debian/control b/debian/control index 439dc06..e2ff092 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,8 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk2.0-dev (>= 2.12.0) + libgtk2.0-dev (>= 2.12.0), + libindicator0 Description: GNOME panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 7b0d813fe0e2f6fd32ac45a1ddcc85248d1d55f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Nov 2009 23:18:22 -0600 Subject: debian/control: Adding a depend for the -dev package on the base library to stop users from linking staticly. --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eeee5c1..ab70026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low + + * debian/control: Adding a depend for the -dev package on the + base library to stop users from linking staticly. + + -- Ted Gould Mon, 16 Nov 2009 23:17:50 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa4) karmic; urgency=low * 64-bit fix for printf's diff --git a/debian/control b/debian/control index 439dc06..f0b27ee 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,8 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk2.0-dev (>= 2.12.0) + libgtk2.0-dev (>= 2.12.0), + libindicator0 (= ${binary:Version}) Description: GNOME panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From f040dac44d23d5aa0a289e78857bf66d30e18b7a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Nov 2009 23:18:28 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab70026..6032cdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa5) karmic; urgency=low * debian/control: Adding a depend for the -dev package on the base library to stop users from linking staticly. - -- Ted Gould Mon, 16 Nov 2009 23:17:50 -0600 + -- Ted Gould Mon, 16 Nov 2009 23:18:24 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa4) karmic; urgency=low -- cgit v1.2.3 From 5a914cab764be1b49e5aad9c6c50c9d4365f819d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 10:33:21 -0600 Subject: debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. --- debian/changelog | 2 ++ debian/control | 7 +++++++ debian/libindicator-tools.install | 1 + 3 files changed, 10 insertions(+) create mode 100644 debian/libindicator-tools.install diff --git a/debian/changelog b/debian/changelog index bda1693..e6a0715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libindicator (0.3.0~dev-0ubuntu1~ppa6~tl1) UNRELEASED; urgency=low * Adding a new tool to load indicators from the command line. + * debian/control, debian/libindicator-tools: Adding in a new + package for the tools of libindicator. -- Ted Gould Tue, 24 Nov 2009 10:28:21 -0600 diff --git a/debian/control b/debian/control index f0b27ee..394ec97 100644 --- a/debian/control +++ b/debian/control @@ -38,3 +38,10 @@ Description: GNOME panel indicator applet - shared library . This package contains files that are needed to build applications. +Package: libindicator-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Need a better description + diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install new file mode 100644 index 0000000..e9565f0 --- /dev/null +++ b/debian/libindicator-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator/* -- cgit v1.2.3 From 06ac252b809a6d7ca932a694ff499d7db2bab6e5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 10:34:31 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa6~tl1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6a0715..b1829b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa6~tl1) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa6~tl1) karmic; urgency=low * Adding a new tool to load indicators from the command line. * debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. - -- Ted Gould Tue, 24 Nov 2009 10:28:21 -0600 + -- Ted Gould Tue, 24 Nov 2009 10:34:29 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa5) karmic; urgency=low -- cgit v1.2.3 From 8e829711dd95a8e94bf63ec16f4d3a266f5ddc39 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 14:52:43 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa6~tl2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 728b2bd..beacae9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa6~tl2) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa6~tl2) karmic; urgency=low * Adding support for remove. - -- Ted Gould Tue, 24 Nov 2009 14:51:09 -0600 + -- Ted Gould Tue, 24 Nov 2009 14:52:41 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa6~tl1) karmic; urgency=low -- cgit v1.2.3 From 411182c39c63d7d7ad35edf133ba58e2295f5bef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 14:55:22 -0600 Subject: debian/control: Making sure the tools package is using the same version of the library that it was built with. --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index beacae9..f1ce3b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa6~tl3) UNRELEASED; urgency=low + + * debian/control: Making sure the tools package is using the + same version of the library that it was built with. + + -- Ted Gould Tue, 24 Nov 2009 14:54:28 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa6~tl2) karmic; urgency=low * Adding support for remove. diff --git a/debian/control b/debian/control index 394ec97..d4fd2f2 100644 --- a/debian/control +++ b/debian/control @@ -42,6 +42,7 @@ Package: libindicator-tools Section: devel Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libindicator0 (= ${binary:Version}) Description: Need a better description -- cgit v1.2.3 From d66daf8d768fcff762c14fa41161b2115fbeaee6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 14:56:18 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa6~tl3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f1ce3b7..42a970f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa6~tl3) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa6~tl3) karmic; urgency=low * debian/control: Making sure the tools package is using the same version of the library that it was built with. - -- Ted Gould Tue, 24 Nov 2009 14:54:28 -0600 + -- Ted Gould Tue, 24 Nov 2009 14:56:15 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa6~tl2) karmic; urgency=low -- cgit v1.2.3 From 0d1af254e912f1982fb4be75acc3cb214b4338ed Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 16:36:04 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2784c2a..974460a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa6) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa6) karmic; urgency=low * Adding a new tool to load indicators from the command line. * debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. - -- Ted Gould Tue, 24 Nov 2009 16:34:33 -0600 + -- Ted Gould Tue, 24 Nov 2009 16:35:58 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa5) karmic; urgency=low -- cgit v1.2.3 From 8f124e3cac3a7942d32aaf074d18ffa8d8847b9e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 2 Dec 2009 08:40:09 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8df2c3c..4718b14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa7) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa7) karmic; urgency=low * Adding an 'UnWatch' command to the standard DBus interface for graceful disconnection from a service. - -- Ted Gould Wed, 02 Dec 2009 08:36:06 -0600 + -- Ted Gould Wed, 02 Dec 2009 08:40:06 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa6) karmic; urgency=low -- cgit v1.2.3 From 6db57d8ca2ce6222358ef5151f522eb6bc8a53c3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Dec 2009 08:49:16 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17eaaa3..86cd05b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa8) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa8) karmic; urgency=low * autogen.sh fix. (LP: #491907) - -- Ted Gould Thu, 03 Dec 2009 08:46:56 -0600 + -- Ted Gould Thu, 03 Dec 2009 08:49:12 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa7) karmic; urgency=low -- cgit v1.2.3 From 578ffd23fbf58d7ddc5eb4ddfa3588dba535304e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 7 Dec 2009 13:11:39 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa9 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64e94f0..51d9881 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa9) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa9) karmic; urgency=low * Adding in a service API version number. - -- Ted Gould Mon, 07 Dec 2009 13:10:14 -0600 + -- Ted Gould Mon, 07 Dec 2009 13:11:37 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa8) karmic; urgency=low -- cgit v1.2.3 From 97c515e7bd2cf006f581a1a938af40ff4dbd2cc3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 7 Dec 2009 14:24:36 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa10 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0841b50..8b49330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa10) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa10) karmic; urgency=low * Licensing and doc updates. * Minor code cleanups - -- Ted Gould Mon, 07 Dec 2009 14:23:05 -0600 + -- Ted Gould Mon, 07 Dec 2009 14:24:34 -0600 libindicator (0.3.0~dev-0ubuntu1~ppa9) karmic; urgency=low -- cgit v1.2.3 From b4fb8024ddf7813a0cefb286f81d3ea06cb5a14f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Dec 2009 10:59:39 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa11 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 084ad12..73f5268 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa11) UNRELEASED; urgency=low +libindicator (0.3.0~dev-0ubuntu1~ppa11) karmic; urgency=low * Upstream 0.3.0 Release * Adds a new tool to load indicators from the command line. @@ -9,7 +9,7 @@ libindicator (0.3.0~dev-0ubuntu1~ppa11) UNRELEASED; urgency=low * debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. - -- Ted Gould Thu, 10 Dec 2009 10:55:07 -0600 + -- Ted Gould Thu, 10 Dec 2009 10:59:37 -0600 libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 5f5763c6bc5e090bde8530125a984199fcfeca6f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Dec 2009 11:00:11 -0600 Subject: releasing version 0.3.0-0ubuntu1~ppa1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 73f5268..756f85e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.0~dev-0ubuntu1~ppa11) karmic; urgency=low +libindicator (0.3.0-0ubuntu1~ppa1) karmic; urgency=low * Upstream 0.3.0 Release * Adds a new tool to load indicators from the command line. -- cgit v1.2.3 From 697b32465326012e004d1af61e036b03dfb4f3c6 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 12:02:39 -0500 Subject: set version number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 756f85e..b32330a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.0-0ubuntu1~ppa1) karmic; urgency=low +libindicator (0.3.0-0ubuntu1) karmic; urgency=low * Upstream 0.3.0 Release * Adds a new tool to load indicators from the command line. -- cgit v1.2.3 From c45b838f4dd31955d563bff6df163f65b75f9482 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 12:15:54 -0500 Subject: * debian/control: - Added description for libindicator-tools --- debian/changelog | 6 +++++- debian/control | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b32330a..521cb44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ libindicator (0.3.0-0ubuntu1) karmic; urgency=low + * debian/control: + - Added description for libindicator-tools + + [Ted Gould] * Upstream 0.3.0 Release * Adds a new tool to load indicators from the command line. * Adds an object for loading indicators. @@ -9,7 +13,7 @@ libindicator (0.3.0-0ubuntu1) karmic; urgency=low * debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. - -- Ted Gould Thu, 10 Dec 2009 10:59:37 -0600 + -- Ken VanDine Thu, 10 Dec 2009 12:11:49 -0500 libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low diff --git a/debian/control b/debian/control index d4fd2f2..aa6d787 100644 --- a/debian/control +++ b/debian/control @@ -44,5 +44,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicator0 (= ${binary:Version}) -Description: Need a better description - +Description: Tools for libindicator + Tools useful for developers of applications using indicators. + . + This package contains files that are needed to build applications. -- cgit v1.2.3 From b6fb26bfc6ecc1f0a6b3cd24bf633adf3a6f74ed Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 12:18:01 -0500 Subject: set release for lucid --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 521cb44..c20f522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.0-0ubuntu1) karmic; urgency=low +libindicator (0.3.0-0ubuntu1) lucid; urgency=low * debian/control: - Added description for libindicator-tools -- cgit v1.2.3 From f8d47e919d46d5daccb76958bb27064cea0f337c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Jan 2010 21:45:58 -0600 Subject: releasing version 0.3.0-0ubuntu2~ppa1~restart1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 395dd92..1a58ef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0-0ubuntu2~ppa1~restart1) UNRELEASED; urgency=low +libindicator (0.3.0-0ubuntu2~ppa1~restart1) karmic; urgency=low * Upstream Merge * Adding in the code to restart services - -- Ted Gould Fri, 15 Jan 2010 21:44:22 -0600 + -- Ted Gould Fri, 15 Jan 2010 21:45:56 -0600 libindicator (0.3.0-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From faa40d719e92f3b27d796313ff38d41c0cc702a5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Jan 2010 22:19:16 -0600 Subject: releasing version 0.3.0-0ubuntu2~ppa1~restart2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 132367f..3d170bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0-0ubuntu2~ppa1~restart2) UNRELEASED; urgency=low +libindicator (0.3.0-0ubuntu2~ppa1~restart2) karmic; urgency=low * Upstream Merge * Emitting the connection changed signal better. - -- Ted Gould Fri, 15 Jan 2010 22:17:01 -0600 + -- Ted Gould Fri, 15 Jan 2010 22:19:13 -0600 libindicator (0.3.0-0ubuntu2~ppa1~restart1) karmic; urgency=low -- cgit v1.2.3 From 2265c847c4fa5d092e72d3e4b6bfb3938371ecb1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 18 Jan 2010 12:57:38 -0600 Subject: releasing version 0.3.0-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 586f1b4..d11b29b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.0-0ubuntu2~ppa1) karmic; urgency=low * Upstream Merge * Adding in the code to restart services - -- Ted Gould Mon, 18 Jan 2010 12:54:33 -0600 + -- Ted Gould Mon, 18 Jan 2010 12:57:31 -0600 libindicator (0.3.0-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 292d5b0d5a8b7fd40fd8a2b713652a25890e1d72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 18 Jan 2010 14:07:03 -0600 Subject: releasing version 0.3.0-0ubuntu2~ppa2~ordering1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 701af78..e8e9ac2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0-0ubuntu2~ppa2~ordering1) UNRELEASED; urgency=low +libindicator (0.3.0-0ubuntu2~ppa2~ordering1) karmic; urgency=low * Upstream Merge * Adding in entry ordering. - -- Ted Gould Mon, 18 Jan 2010 14:05:32 -0600 + -- Ted Gould Mon, 18 Jan 2010 14:06:59 -0600 libindicator (0.3.0-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 38d6422c9ed920b979029dfb3896093c95e75660 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 19 Jan 2010 09:00:53 -0600 Subject: releasing version 0.3.0-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e55be1c..bc3fa16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.0-0ubuntu2~ppa2) UNRELEASED; urgency=low +libindicator (0.3.0-0ubuntu2~ppa2) karmic; urgency=low * Upstream Merge * Adding in entry ordering. - -- Ted Gould Tue, 19 Jan 2010 08:58:40 -0600 + -- Ted Gould Tue, 19 Jan 2010 09:00:50 -0600 libindicator (0.3.0-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 8f6a206a4689150d8887dd653f13e72b2d320a15 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Jan 2010 13:15:10 -0600 Subject: releasing version 0.3.1-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c44446..bf71422 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.1-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.3.1 * Adding in entry ordering. * Adding in the code to restart services - -- Ted Gould Thu, 21 Jan 2010 13:03:32 -0600 + -- Ted Gould Thu, 21 Jan 2010 13:15:07 -0600 libindicator (0.3.0-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 7e7507e9e20d7e31ecf14dbbf6ff6d19e2e3326d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 28 Jan 2010 21:43:02 -0800 Subject: releasing version 0.3.1-0ubuntu1~ppa2~better1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 160c617..e2e58e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.1-0ubuntu1~ppa2~better1) UNRELEASED; urgency=low +libindicator (0.3.1-0ubuntu1~ppa2~better1) lucid; urgency=low * Upstream merge * Various fixes to timeout handling in servcies and the service manager. - -- Ted Gould Thu, 28 Jan 2010 21:41:19 -0800 + -- Ted Gould Thu, 28 Jan 2010 21:42:58 -0800 libindicator (0.3.1-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From e0dbaa39db9ccf72a4dd9405d620a590ac751249 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Feb 2010 23:59:26 -0800 Subject: releasing version 0.3.1-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccb0d37..420d728 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.1-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.1-0ubuntu1~ppa2) lucid; urgency=low * Upstream merge * Various fixes to timeout handling in servcies and the service manager. - -- Ted Gould Mon, 01 Feb 2010 23:57:52 -0800 + -- Ted Gould Mon, 01 Feb 2010 23:59:23 -0800 libindicator (0.3.1-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From 72ef75fa51c63e533ff2883bffc75bfc86a2c521 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 4 Feb 2010 17:40:09 -0800 Subject: releasing version 0.3.2-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a6c100..70a75d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.2-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.2-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.3.2 * Various fixes to timeout handling in services and the service manager. * Fix test suite when run headless - -- Ted Gould Thu, 04 Feb 2010 17:37:04 -0800 + -- Ted Gould Thu, 04 Feb 2010 17:40:06 -0800 libindicator (0.3.1-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From fdc2872ab554e4e468b3cab47dd9c25ac0fbfa47 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 16 Feb 2010 22:52:10 -0600 Subject: releasing version 0.3.2-0ubuntu1~ppa2~shortcuts1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7b15c8..76acb02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.2-0ubuntu1~ppa2~shortcuts1) UNRELEASED; urgency=low +libindicator (0.3.2-0ubuntu1~ppa2~shortcuts1) lucid; urgency=low * Upstream merge * Adding new object for parsing desktop files for Shortcuts - -- Ted Gould Tue, 16 Feb 2010 22:50:39 -0600 + -- Ted Gould Tue, 16 Feb 2010 22:52:07 -0600 libindicator (0.3.2-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From bf7525ab42e008be9cdabccd57189bf584b6fe30 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 10:07:56 -0600 Subject: releasing version 0.3.2-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e358a58..23f389d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.2-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.2-0ubuntu1~ppa2) lucid; urgency=low * Upstream merge * Adding new object for parsing desktop files for Shortcuts - -- Ted Gould Thu, 18 Feb 2010 10:06:19 -0600 + -- Ted Gould Thu, 18 Feb 2010 10:07:54 -0600 libindicator (0.3.2-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 6528ac058ec48080e39fd0d83f2e5f78b5da3111 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 10:11:24 -0600 Subject: releasing version 0.3.3-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 558edae..d0aed1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.3-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.3-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.3.3 * Adding new object for parsing desktop files for Shortcuts - -- Ted Gould Thu, 18 Feb 2010 10:08:06 -0600 + -- Ted Gould Thu, 18 Feb 2010 10:11:21 -0600 libindicator (0.3.2-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From d4404ea28806ee86d420b1c43e88255d2d3bfcf1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 21:04:56 -0600 Subject: debian/control: Reducing libglib dependency down to 2.22 for Karmic builds --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12f819d..322118f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.3-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: + Reducing libglib dependency down to 2.22 for Karmic builds + + -- Ted Gould Wed, 24 Feb 2010 21:04:26 -0600 + libindicator (0.3.3-0ubuntu1) lucid; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 52a36ed..686f637 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libglib2.0-dev (>= 2.23), + libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, libtool, -- cgit v1.2.3 From 802da09ad542f6c091671d4d02973ae6a7d10b4b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 21:05:05 -0600 Subject: releasing version 0.3.3-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 322118f..116dfe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.3-0ubuntu2) UNRELEASED; urgency=low +libindicator (0.3.3-0ubuntu2) lucid; urgency=low * debian/control: Reducing libglib dependency down to 2.22 for Karmic builds - -- Ted Gould Wed, 24 Feb 2010 21:04:26 -0600 + -- Ted Gould Wed, 24 Feb 2010 21:05:01 -0600 libindicator (0.3.3-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 436e5f16715448637e71fad02689d99eb7a2d8c6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 25 Feb 2010 11:27:26 -0600 Subject: releasing version 0.3.4-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5560e9f..97517b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.4-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.4-0ubuntu1~ppa1) lucid; urgency=low * Upstream Release 0.3.4 * Reducing gio-unix dependency to 2.22 - -- Ted Gould Thu, 25 Feb 2010 11:23:44 -0600 + -- Ted Gould Thu, 25 Feb 2010 11:27:18 -0600 libindicator (0.3.3-0ubuntu2) lucid; urgency=low -- cgit v1.2.3 From 9bc7677cb39433b30768bd0a1f878b6f5277704b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 16:58:15 -0600 Subject: releasing version 0.3.4-0ubuntu1~ppa2~imagehelper1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b9c025..2300cbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.4-0ubuntu1~ppa2~imagehelper1) UNRELEASED; urgency=low +libindicator (0.3.4-0ubuntu1~ppa2~imagehelper1) lucid; urgency=low * Upstream merge * Adding in a image loader helper for indicators. - -- Ted Gould Wed, 10 Mar 2010 16:55:17 -0600 + -- Ted Gould Wed, 10 Mar 2010 16:58:13 -0600 libindicator (0.3.4-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From d4246925f5f7e855eb153b7b825456c1f6653e93 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Mar 2010 22:12:35 -0600 Subject: releasing version 0.3.4-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0752c40..8f521ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.4-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.4-0ubuntu1~ppa2) lucid; urgency=low * Upstream merge * Adding in a image loader helper for indicators. - -- Ted Gould Wed, 10 Mar 2010 22:09:43 -0600 + -- Ted Gould Wed, 10 Mar 2010 22:12:32 -0600 libindicator (0.3.4-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 0de990f43c73324b2e321747fa666614f95ac111 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 14:26:15 -0600 Subject: releasing version 0.3.5-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbb6996..4d9c0a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.5-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.5-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.3.5 * Adding in a image loader helper for indicators. - -- Ted Gould Thu, 11 Mar 2010 14:22:09 -0600 + -- Ted Gould Thu, 11 Mar 2010 14:26:11 -0600 libindicator (0.3.4-0ubuntu1) lucid; urgency=low -- 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(-) 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 a815f8420172fd403de2669ecce4b6a2c19dc5f9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 14:27:17 -0600 Subject: releasing version 0.3.5-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83a7e5b..ff7f91a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.5-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.5-0ubuntu1~ppa2) lucid; urgency=low * debian/rules: Updating shlibs number - -- Ted Gould Thu, 11 Mar 2010 14:26:32 -0600 + -- Ted Gould Thu, 11 Mar 2010 14:27:04 -0600 libindicator (0.3.5-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From a68b0e81fd88b54b019ab32d5745b7f2a3d756d3 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 11 Mar 2010 22:52:27 +0100 Subject: releasing version 0.3.5-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c79b509..65d8509 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.5-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.3.5-0ubuntu1) lucid; urgency=low * Upstream release 0.3.5 * Adding in a image loader helper for indicators. -- 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(-) 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 f07a2dff0b358a94d30908cb2f9cd66c13cf4afc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Mar 2010 11:10:23 -0500 Subject: releasing version 0.3.6-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc74400..813435a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.6-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.6-0ubuntu1~ppa1) lucid; 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 + -- Ted Gould Thu, 18 Mar 2010 11:10:20 -0500 libindicator (0.3.5-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 0cf6e6003e546c808968c2a1cd909e10be00a12f Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 18 Mar 2010 23:34:24 +0100 Subject: releasing version 0.3.6-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ac14b51..c7f72ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.6-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.3.6-0ubuntu1) lucid; urgency=low * Upstream release 0.3.6 * Adding in scroll signals for the indicators -- cgit v1.2.3 From 49c5444af4042b1084c00009f5ff5a65996b300b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Apr 2010 10:52:01 -0500 Subject: releasing version 0.3.6-0ubuntu1~ppa2~shortcutdomain1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1166d59..b349303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain1) UNRELEASED; urgency=low +libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain1) lucid; urgency=low * Upstream merge * Use the domain in desktop files for shortcuts - -- Ted Gould Fri, 02 Apr 2010 10:50:28 -0500 + -- Ted Gould Fri, 02 Apr 2010 10:51:59 -0500 libindicator (0.3.6-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From e0f5fb7d0f6a89f79cab7d26f2d12ef710fc223b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 5 Apr 2010 15:37:15 -0500 Subject: releasing version 0.3.6-0ubuntu1~ppa2~shortcutdomain2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1efeaa..22dd56d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain2) UNRELEASED; urgency=low +libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain2) lucid; urgency=low * Upstream merge * Chnages requested by pitt - -- Ted Gould Mon, 05 Apr 2010 15:21:06 -0500 + -- Ted Gould Mon, 05 Apr 2010 15:37:13 -0500 libindicator (0.3.6-0ubuntu1~ppa2~shortcutdomain1) lucid; urgency=low -- cgit v1.2.3 From 6262d6f411ffdedc114ebca5ffa3f1b527b7c57f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 16:21:22 -0500 Subject: releasing version 0.3.6-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a68c10..38f8168 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.6-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.6-0ubuntu2~ppa1) lucid; urgency=low * Upstream merge * Use the domain in desktop files for shortcuts (LP: #549322) - -- Ted Gould Tue, 06 Apr 2010 15:58:33 -0500 + -- Ted Gould Tue, 06 Apr 2010 16:21:18 -0500 libindicator (0.3.6-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From e9392e98b500f47f4eab225108196cd031f0038c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Apr 2010 11:57:05 -0500 Subject: No merging --- .bzr-builddeb/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf index 3165e05..36c28f8 100644 --- a/.bzr-builddeb/default.conf +++ b/.bzr-builddeb/default.conf @@ -1,2 +1,2 @@ [BUILDDEB] -merge = True +merge = False -- cgit v1.2.3 From 3e9180aefb4f71a9ea55fb58d148d3f63507c52a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Apr 2010 12:53:42 -0500 Subject: releasing version 0.3.7-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 888e321..c95cc03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.7-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.7-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Use the domain in desktop files for shortcuts (LP: #549322) - -- Ted Gould Fri, 09 Apr 2010 11:57:54 -0500 + -- Ted Gould Fri, 09 Apr 2010 12:53:39 -0500 libindicator (0.3.6-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 478b7f7a65f1ed01a915d65631c28d82401b7f22 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Apr 2010 12:56:24 -0500 Subject: releasing version 0.3.8-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f754e2d..480e3f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.8-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.8-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Adding template files to tarball - -- Ted Gould Fri, 09 Apr 2010 12:54:18 -0500 + -- Ted Gould Fri, 09 Apr 2010 12:56:19 -0500 libindicator (0.3.7-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 30f1ae42f91519b8f06660c8c352a5fefb301c4b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:50:48 +0200 Subject: Apply 0.3.8-1 changes * Merge Ubuntu package into Debian. Closes: #549999 * debian/copyright: + Update to machine readable format. * debian/control: + Drop cdbs Build-Dep, bump debhelper to >=7. + Standards-Version 3.8.4. + Update Vcs-* fields. + Drop GNOME from Description, the package is not GNOME specific. + Slightly update Description, thanks lintian. * debian/rules: + Use minimal debhelper 7 rules without cdbs. + Disable tests for now, they fail (launchpad 587811) * debian/source/format: + Add file, make package 3.0 (quilt). --- debian/changelog | 21 ++++++++++++++++++++- debian/control | 18 +++++++++--------- debian/copyright | 42 +++++++++++++----------------------------- debian/rules | 12 +++++++++--- debian/source/format | 1 + 5 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 4abbcdd..cd22c14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libindicator (0.3.8-1) unstable; urgency=low + + * Merge Ubuntu package into Debian. + Closes: #549999 + * debian/copyright: + + Update to machine readable format. + * debian/control: + + Drop cdbs Build-Dep, bump debhelper to >=7. + + Standards-Version 3.8.4. + + Update Vcs-* fields. + + Drop GNOME from Description, the package is not GNOME specific. + + Slightly update Description, thanks lintian. + * debian/rules: + + Use minimal debhelper 7 rules without cdbs. + + Disable tests for now, they fail (launchpad 587811) + * debian/source/format: + + Add file, make package 3.0 (quilt). + + -- Evgeni Golov Mon, 07 Jun 2010 11:21:32 +0200 + libindicator (0.3.8-0ubuntu1) lucid; urgency=low * New upstream release. @@ -142,4 +162,3 @@ libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low * debian/control: Fix Vcs-* links. -- Ken VanDine Tue, 25 Aug 2009 08:35:00 +0200 - diff --git a/debian/control b/debian/control index 686f637..6edb124 100644 --- a/debian/control +++ b/debian/control @@ -1,30 +1,30 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Ubuntu Core Developers -Build-Depends: debhelper (>= 5.0), - cdbs (>= 0.4.41), +Maintainer: Evgeni Golov +Uploaders: Kartik Mistry +Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.0 +Standards-Version: 3.8.4 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-Git: git://git.debian.org/collab-maint/libindicator.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/libindicator.git Package: libindicator0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GNOME panel indicator applet - shared library +Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. . - This package contains files that are needed to build applications. + This package contains the library itself. Package: libindicator-dev Section: libdevel @@ -33,7 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), libindicator0 (= ${binary:Version}) -Description: GNOME panel indicator applet - shared library +Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. . diff --git a/debian/copyright b/debian/copyright index ca1ebdd..f47fefc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,33 +1,17 @@ -This package was debianized by Ted Gould on -Wed, 11 Feb 2009 15:41:06 -0600. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libindicator +Maintainer: Ted Gould +Source: https://launchpad.net/libindicator -It was downloaded from +Files: * +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 -Upstream Author: - - Ted Gould - -Copyright: - - Copyright (C) 2009 Canonical Ltd. - -License: - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, version 3 of the License. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +Files: debian/* +Copyright: 2009-2010 Evgeni Golov +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 +License: GPL-3 On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is (C) 2009, Canonical Ltd. and -is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules index 151c78d..9612514 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,14 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' +%: + dh $@ + +override_dh_auto_test: + +override_dh_makeshlibs: + dh_makeshlibs -V 'libindicator0 (>= 0.3.6)' 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) -- cgit v1.2.3 From e3df28309fff9d052b6474821870beb724b64ce5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:52:28 +0200 Subject: Revert cdbs drop, as requested by the Ubuntu maintainers. --- debian/changelog | 6 ++++++ debian/control | 3 ++- debian/rules | 12 +++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd22c14..4a78988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.8-2) unstable; urgency=low + + * Revert cdbs drop, as requested by the Ubuntu maintainers. + + -- Evgeni Golov Wed, 16 Jun 2010 09:51:54 +0200 + libindicator (0.3.8-1) unstable; urgency=low * Merge Ubuntu package into Debian. diff --git a/debian/control b/debian/control index 6edb124..8748c62 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: libs Priority: optional Maintainer: Evgeni Golov Uploaders: Kartik Mistry -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, diff --git a/debian/rules b/debian/rules index 9612514..151c78d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,8 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -%: - dh $@ - -override_dh_auto_test: - -override_dh_makeshlibs: - dh_makeshlibs -V 'libindicator0 (>= 0.3.6)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' -- cgit v1.2.3 From 34b4a4d73f886573fc992d0618f44817ec12c3a5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:55:10 +0200 Subject: Update Maintainer and Vcs-* fields for pkg-ayatana. --- debian/changelog | 3 ++- debian/control | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a78988..b9f01e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libindicator (0.3.8-2) unstable; urgency=low * Revert cdbs drop, as requested by the Ubuntu maintainers. + * Update Maintainer and Vcs-* fields for pkg-ayatana. - -- Evgeni Golov Wed, 16 Jun 2010 09:51:54 +0200 + -- Evgeni Golov Wed, 16 Jun 2010 09:54:50 +0200 libindicator (0.3.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8748c62..5e1dfe8 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Evgeni Golov -Uploaders: Kartik Mistry +Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), @@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.8.4 Homepage: https://launchpad.net/libindicator -Vcs-Git: git://git.debian.org/collab-maint/libindicator.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/libindicator.git +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian Package: libindicator0 Section: libs -- cgit v1.2.3 From 589e659020e5653c8a2f4e83b9fdc440d43272a3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Jun 2010 13:29:19 -0500 Subject: releasing version 0.3.8-2ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b624a2..c6db7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.8-2ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.8-2ubuntu1~ppa1) lucid; urgency=low * Merge debian changes * Drop debian/source/* * debian/control: Switch VCS for this branch to be the indicator applet developers branch. - -- Ted Gould Wed, 16 Jun 2010 13:27:29 -0500 + -- Ted Gould Wed, 16 Jun 2010 13:29:16 -0500 libindicator (0.3.8-2) unstable; urgency=low -- cgit v1.2.3 From 359c67088ee6eeefc1a7fc28316b94e04ba0feec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Jul 2010 11:07:22 -0500 Subject: releasing version 0.3.8-2ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e1d128..87dd9b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.8-2ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.8-2ubuntu1~ppa2) lucid; urgency=low * Upstream Merge * Make it so that a watcher dying is the same as unregistering. - -- Ted Gould Tue, 06 Jul 2010 11:05:57 -0500 + -- Ted Gould Tue, 06 Jul 2010 11:07:20 -0500 libindicator (0.3.8-2ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 2b3087f569dc7f4db6bb94f48cdf902c4d402b6d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Jul 2010 09:25:29 -0500 Subject: releasing version 0.3.8-2ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4394823..c4b3ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.8-2ubuntu1~ppa3) UNRELEASED; urgency=low +libindicator (0.3.8-2ubuntu1~ppa3) lucid; urgency=low * Merge Upstream * Removing checking for style properties that aren't used. * Make it so that a watcher dying is the same as unregistering. - -- Ted Gould Thu, 08 Jul 2010 09:21:55 -0500 + -- Ted Gould Thu, 08 Jul 2010 09:25:25 -0500 libindicator (0.3.8-2ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 3fc3179d758ccef92bbc8e33d4ae20b5ab79a8b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Jul 2010 15:19:11 -0500 Subject: releasing version 0.3.9-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5cc8b50..e9f1326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.9-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.9-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Removing checking for style properties that aren't used. @@ -8,7 +8,7 @@ libindicator (0.3.9-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Switch VCS for this branch to be the indicator applet developers branch. - -- Ted Gould Thu, 08 Jul 2010 15:17:32 -0500 + -- Ted Gould Thu, 08 Jul 2010 15:19:08 -0500 libindicator (0.3.8-2) unstable; urgency=low -- cgit v1.2.3 From e102f849159f06f726ea24df837b0350f4df4c2f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 13:43:53 -0500 Subject: releasing version 0.3.9-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c45a932..b80ec3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.9-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.9-0ubuntu2~ppa1) lucid; urgency=low * Upstream merge * Fixing unwatching crash (LP: #603489) - -- Ted Gould Fri, 09 Jul 2010 13:40:46 -0500 + -- Ted Gould Fri, 09 Jul 2010 13:43:50 -0500 libindicator (0.3.9-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 55e4c2c2ce34acfb18fff3e806ddd580d46b1822 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 14 Jul 2010 10:04:40 +0200 Subject: Add "Don't drop debian/source/*" to the changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c86d5b9..d756a9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libindicator (0.3.9-1) unstable; urgency=low * Merging new upstream release and some changes from Ubuntu. + * Don't drop debian/source/* - -- Evgeni Golov Wed, 14 Jul 2010 10:02:55 +0200 + -- Evgeni Golov Wed, 14 Jul 2010 10:04:21 +0200 libindicator (0.3.9-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From 8b7fa3f649123d88bc1a036795fd9a85d6565ab4 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 14 Jul 2010 10:07:48 +0200 Subject: Standards-Version: 3.9.0 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d756a9e..b11f3a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libindicator (0.3.9-1) unstable; urgency=low * Merging new upstream release and some changes from Ubuntu. * Don't drop debian/source/* + * Standards-Version: 3.9.0 - -- Evgeni Golov Wed, 14 Jul 2010 10:04:21 +0200 + -- Evgeni Golov Wed, 14 Jul 2010 10:07:36 +0200 libindicator (0.3.9-0ubuntu2) maverick; urgency=low diff --git a/debian/control b/debian/control index 5e1dfe8..00e2d8f 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian -- cgit v1.2.3 From c6b0ab35023b3a68130ff692ab3d85cf5b44831e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Jul 2010 10:02:59 -0500 Subject: releasing version 0.3.10-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6baa290..8197a31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.10-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.10-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Fixing unwatching crash (LP: #603489) * Adding configurable timeout for slow test systems - -- Ted Gould Thu, 15 Jul 2010 10:01:38 -0500 + -- Ted Gould Thu, 15 Jul 2010 10:02:56 -0500 libindicator (0.3.9-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From 1c80632cb5c3aa06e9788eb35122d3bd7e717e08 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Aug 2010 14:42:49 -0500 Subject: releasing version 0.3.11-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67fb489..8eccf0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.11-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.11-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Allowing absolute paths in the image name (LP: #564034) - -- Ted Gould Thu, 12 Aug 2010 14:41:15 -0500 + -- Ted Gould Thu, 12 Aug 2010 14:42:46 -0500 libindicator (0.3.10-0ubuntu1) maverick; urgency=low -- 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 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 8839b12e3deb35d69a61edc87d0d8649b6459132 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 18 Aug 2010 11:05:54 -0500 Subject: releasing version 0.3.12-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70fdc65..ace2ebf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.12-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.12-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Removing a g_error that was breaking Unity on failed icons * dropping workaround-icon-crash.patch: - -- Ted Gould Wed, 18 Aug 2010 11:02:03 -0500 + -- Ted Gould Wed, 18 Aug 2010 11:05:51 -0500 libindicator (0.3.11-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From f09d02660bf772a64c956830c3548f21a4410e0f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Sep 2010 10:54:25 -0500 Subject: releasing version 0.3.12-0ubuntu1~ppa2 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 831f3f5..b9d4834 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ libindicator (0.3.12-0ubuntu1~ppa2) maverick; urgency=low * Upstream Merge * Adding a menu_show signal - -- Ted Gould Tue, 14 Sep 2010 10:53:29 -0500 + -- Ted Gould Tue, 14 Sep 2010 10:54:23 -0500 libindicator (0.3.12-0ubuntu1~ppa1) maverick; urgency=low -- cgit v1.2.3 From ed40c3c08c841021c6a48f4656ac754311c55abc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Sep 2010 10:56:53 -0500 Subject: Flipping PPA version around --- debian/changelog | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 787502b..148c3f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,11 @@ -libindicator (0.3.12-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Removing a g_error that was breaking Unity on failed icons - * dropping workaround-icon-crash.patch: - - -- Ted Gould Wed, 18 Aug 2010 11:05:51 -0500 - -libindicator (0.3.12-0ubuntu1~ppa2) maverick; urgency=low +libindicator (0.3.12-0ubuntu2~ppa1) UNRELEASED; urgency=low * Upstream Merge * Adding a menu_show signal - -- Ted Gould Tue, 14 Sep 2010 10:54:23 -0500 + -- Ted Gould Tue, 14 Sep 2010 10:56:10 -0500 -libindicator (0.3.12-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.12-0ubuntu1) maverick; urgency=low * New upstream release. * Removing a g_error that was breaking Unity on failed icons -- cgit v1.2.3 From 74b347abb9188c4dbf48a74b6baa5f622f15a02e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Sep 2010 10:57:35 -0500 Subject: releasing version 0.3.12-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 148c3f5..d668acf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.12-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.12-0ubuntu2~ppa1) maverick; urgency=low * Upstream Merge * Adding a menu_show signal - -- Ted Gould Tue, 14 Sep 2010 10:56:10 -0500 + -- Ted Gould Tue, 14 Sep 2010 10:57:33 -0500 libindicator (0.3.12-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 0bcacdcdc45b229e955d9e9d748580f4c3fb3fd1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 15 Sep 2010 11:46:43 -0500 Subject: releasing version 0.3.13-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 474c04d..f41decf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.13-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Adding a menu_show signal - -- Ted Gould Wed, 15 Sep 2010 11:44:41 -0500 + -- Ted Gould Wed, 15 Sep 2010 11:46:37 -0500 libindicator (0.3.12-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From afe60bd5daa81d3a25cb015e6b6654119b15cc09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 16 Sep 2010 16:36:21 -0500 Subject: debian/control: Switching from libindicator0 to libindicator1 as we've broken ABI. --- debian/changelog | 4 +++- debian/control | 7 ++++--- debian/libindicator0.install | 1 - debian/libindicator1.install | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 debian/libindicator0.install create mode 100644 debian/libindicator1.install diff --git a/debian/changelog b/debian/changelog index 460125d..5fde901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ libindicator (0.3.13-0ubuntu1~ppa2~ats1) UNRELEASED; urgency=low * Upstream Merge * Adding a function to signal a menu is shown + * debian/control: Switching from libindicator0 to libindicator1 + as we've broken ABI. - -- Ted Gould Thu, 16 Sep 2010 16:33:54 -0500 + -- Ted Gould Thu, 16 Sep 2010 16:35:58 -0500 libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low diff --git a/debian/control b/debian/control index 6530e9b..eabc1f9 100644 --- a/debian/control +++ b/debian/control @@ -17,11 +17,12 @@ 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 -Package: libindicator0 +Package: libindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libindicator0 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -34,7 +35,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -46,7 +47,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator0.install b/debian/libindicator0.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator1.install b/debian/libindicator1.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* -- cgit v1.2.3 From 5be1cb681c45f1c0a0f9e63643fc39164fc6b50f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 16 Sep 2010 16:40:10 -0500 Subject: releasing version 0.3.13-0ubuntu1~ppa2~ats1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 494cb43..1374a08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.13-0ubuntu1~ppa2~ats1) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu1~ppa2~ats1) maverick; urgency=low * Upstream Merge * Adding a function to signal a menu is shown @@ -6,7 +6,7 @@ libindicator (0.3.13-0ubuntu1~ppa2~ats1) UNRELEASED; urgency=low * debian/control: Switching from libindicator0 to libindicator1 as we've broken ABI. - -- Ted Gould Thu, 16 Sep 2010 16:37:31 -0500 + -- Ted Gould Thu, 16 Sep 2010 16:40:07 -0500 libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low -- cgit v1.2.3 From aafdfdf392c5d887ad1145ce125a9d9461e07538 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Sep 2010 09:30:36 -0500 Subject: releasing version 0.3.13-0ubuntu1~ppa2~ats2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96e58fe..cc9e2d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.13-0ubuntu1~ppa2~ats2) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu1~ppa2~ats2) maverick; urgency=low * Upstream Merge * Making the library different - -- Ted Gould Fri, 17 Sep 2010 09:17:03 -0500 + -- Ted Gould Fri, 17 Sep 2010 09:30:33 -0500 libindicator (0.3.13-0ubuntu1~ppa2~ats1) maverick; urgency=low -- cgit v1.2.3 From e51d89f10eb9117efaac95ebf9a8233b55986515 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Sep 2010 09:51:48 -0500 Subject: Autogen update --- debian/changelog | 6 ++++++ libindicator/Makefile.in | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc9e2d2..9085907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.13-0ubuntu1~ppa2~ats3) UNRELEASED; urgency=low + + * Autogen update + + -- Ted Gould Fri, 17 Sep 2010 09:51:25 -0500 + libindicator (0.3.13-0ubuntu1~ppa2~ats2) maverick; urgency=low * Upstream Merge diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in index 0dddfe0..209f524 100644 --- a/libindicator/Makefile.in +++ b/libindicator/Makefile.in @@ -105,8 +105,8 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent libindicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libindicator_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ + $(libindicator_la_CFLAGS) $(CFLAGS) $(libindicator_la_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -311,6 +311,11 @@ libindicator_la_CFLAGS = \ libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) +libindicator_la_LDFLAGS = \ + -version-info 1:0:0 \ + -no-undefined \ + -export-symbols-regex "^[^_].*" + pkgconfig_DATA = indicator.pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list -- cgit v1.2.3 From 8d7fd1329103fbd67f01e9dd1b4661c171ae76e6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Sep 2010 09:52:32 -0500 Subject: releasing version 0.3.13-0ubuntu1~ppa2~ats3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9085907..542a812 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.13-0ubuntu1~ppa2~ats3) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu1~ppa2~ats3) maverick; urgency=low * Autogen update - -- Ted Gould Fri, 17 Sep 2010 09:51:25 -0500 + -- Ted Gould Fri, 17 Sep 2010 09:52:30 -0500 libindicator (0.3.13-0ubuntu1~ppa2~ats2) maverick; urgency=low -- cgit v1.2.3 From daaf146585e8bad6912bd926ded7c177a0fe6d0d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Sep 2010 16:41:30 -0500 Subject: debian/control: Replaces really needs to be conflicts. You don't want both of these. --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 542a812..8e8a1a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.13-0ubuntu1~ppa2~ats4) UNRELEASED; urgency=low + + * debian/control: Replaces really needs to be conflicts. You don't + want both of these. + + -- Ted Gould Fri, 17 Sep 2010 16:41:00 -0500 + libindicator (0.3.13-0ubuntu1~ppa2~ats3) maverick; urgency=low * Autogen update diff --git a/debian/control b/debian/control index eabc1f9..0dfe822 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libindicator0 +Conflicts: libindicator0 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 3e7cedba2b9c284e41664eb444d13083d714d90f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 19 Sep 2010 13:29:16 -0500 Subject: releasing version 0.3.13-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0be2f8..66a78c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.13-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu1~ppa2) maverick; urgency=low * Upstream Merge * Adding a function to signal a menu is shown @@ -8,7 +8,7 @@ libindicator (0.3.13-0ubuntu1~ppa2) UNRELEASED; urgency=low upgrade simpler as it doesn't make sense to have both installed. * Autogen update - -- Ted Gould Sun, 19 Sep 2010 13:26:45 -0500 + -- Ted Gould Sun, 19 Sep 2010 13:29:13 -0500 libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low -- 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(-) 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 2af39613b0efacd440e342de204e771b37dfcbd1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 19 Sep 2010 14:47:49 -0500 Subject: releasing version 0.3.13-0ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e69298b..80b981b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.13-0ubuntu1~ppa3) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu1~ppa3) maverick; urgency=low * debian/rules: * Dropping the simple patch system * Changing the shlibs to libindicator1 - -- Ted Gould Sun, 19 Sep 2010 14:41:46 -0500 + -- Ted Gould Sun, 19 Sep 2010 14:47:46 -0500 libindicator (0.3.13-0ubuntu1~ppa2) maverick; urgency=low -- cgit v1.2.3 From c667aaf039d4ccb978be4b2605978d1de1341573 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 21 Sep 2010 12:35:43 +0200 Subject: * debian/source: - don't use quilt format, it's making the daily build not working --- debian/changelog | 7 +++++++ debian/source/format | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index a5ccc9a..20bad04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.13-0ubuntu2) UNRELEASED; urgency=low + + * debian/source: + - don't use quilt format, it's making the daily build not working + + -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 + libindicator (0.3.13-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) -- cgit v1.2.3 From 5ca60866b7146c0bda1f8123c72b07fe4c08859e Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 21 Sep 2010 12:36:23 +0200 Subject: * debian/control: - put the Vcs-Bzr to point the right official branch --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20bad04..62a1087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libindicator (0.3.13-0ubuntu2) UNRELEASED; urgency=low * debian/source: - don't use quilt format, it's making the daily build not working + * debian/control: + - put the Vcs-Bzr to point the right official branch -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 diff --git a/debian/control b/debian/control index 6530e9b..10bccec 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ 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: libindicator0 Section: libs -- cgit v1.2.3 From f7bd2022d25d17dbb9f5a1acbec6f7a1f36e03b0 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 21 Sep 2010 12:45:54 +0200 Subject: - rename to soname bump * debian/libindicator1.install: rename to soname bump * debian/rules: update MAKESHLIBS_ARGS --- debian/changelog | 3 +++ debian/control | 6 +++--- debian/libindicator0.install | 1 - debian/libindicator1.install | 1 + debian/rules | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 debian/libindicator0.install create mode 100644 debian/libindicator1.install diff --git a/debian/changelog b/debian/changelog index 62a1087..f487a12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ libindicator (0.3.13-0ubuntu2) UNRELEASED; urgency=low - don't use quilt format, it's making the daily build not working * debian/control: - put the Vcs-Bzr to point the right official branch + - rename to soname bump + * debian/libindicator1.install: rename to soname bump + * debian/rules: update MAKESHLIBS_ARGS -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 diff --git a/debian/control b/debian/control index 10bccec..a67274d 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,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: libindicator0 +Package: libindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -34,7 +34,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -46,7 +46,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator0.install b/debian/libindicator0.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator1.install b/debian/libindicator1.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/rules b/debian/rules index 095f53b..151b094 100755 --- a/debian/rules +++ b/debian/rules @@ -7,5 +7,5 @@ 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 4b5bf4f7648b5d68a6746edbd5d1af4a6194b528 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 21 Sep 2010 12:46:31 +0200 Subject: ppa version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f487a12..6c340ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.13-0ubuntu2) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low * debian/source: - don't use quilt format, it's making the daily build not working -- cgit v1.2.3 From 6b3ded75e42f4f4bc6284afd8e52cd4769d7ee58 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 09:17:40 -0500 Subject: Drop duplicate changelog entry --- debian/changelog | 7 ------- 1 file changed, 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77177cd..67d6995 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,13 +37,6 @@ libindicator (0.3.13-0ubuntu1~ppa2) maverick; urgency=low -- Ted Gould Sun, 19 Sep 2010 13:29:13 -0500 -libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low - - * New upstream release. - * Adding a menu_show signal - - -- Ted Gould Wed, 15 Sep 2010 11:46:37 -0500 - libindicator (0.3.12-0ubuntu1) maverick; urgency=low * New upstream release. -- cgit v1.2.3 From 027d9ed234da622d47a3f6c1b5e95e0b389047b9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 09:22:02 -0500 Subject: Setting right VCS directories --- debian/changelog | 1 - debian/control | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67d6995..6d61fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ 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: - - put the Vcs-Bzr to point the right official branch - rename to soname bump * debian/libindicator1.install: rename to soname bump * debian/rules: update MAKESHLIBS_ARGS diff --git a/debian/control b/debian/control index 9f16716..0dfe822 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.9.0 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: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Package: libindicator1 Section: libs -- cgit v1.2.3 From bd75a2c63147ef36f082a925d10334720a7627b0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 09:24:18 -0500 Subject: Updating with Desktop version and undoing some changes. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6d61fc8..c14244a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.13-0ubuntu2~ppa2) UNRELEASED; urgency=low + + * Updating with Desktop version and undoing some changes. + + -- Ted Gould Tue, 21 Sep 2010 09:23:58 -0500 + libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low * debian/source: -- cgit v1.2.3 From 32bad82d0c742eef4a9f8bd15e087327f86f0173 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 09:25:07 -0500 Subject: releasing version 0.3.13-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c14244a..aab76c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.3.13-0ubuntu2~ppa2) UNRELEASED; urgency=low +libindicator (0.3.13-0ubuntu2~ppa2) maverick; urgency=low * Updating with Desktop version and undoing some changes. - -- Ted Gould Tue, 21 Sep 2010 09:23:58 -0500 + -- Ted Gould Tue, 21 Sep 2010 09:25:05 -0500 libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low -- cgit v1.2.3 From ac662a1a1a94644d85c4052042a270023fec4f7f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 15:56:00 -0500 Subject: releasing version 0.3.14-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcbf2b8..3b7ca79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.14-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.14-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Adding a function to signal a menu is shown * Changing indicator directory to '4' - -- Ted Gould Tue, 21 Sep 2010 15:53:58 -0500 + -- Ted Gould Tue, 21 Sep 2010 15:55:56 -0500 libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low -- 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(-) 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 948cb8ef96ab75f7f468d535450ce065af3e2c26 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 18:09:47 +0200 Subject: releasing version 0.3.14-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fda7f3..ef85b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.14-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.3.14-0ubuntu1) maverick; urgency=low * New upstream release. * Adding a function to signal a menu is shown (LP: #637692) @@ -16,7 +16,7 @@ libindicator (0.3.14-0ubuntu1) UNRELEASED; urgency=low * debian/rules: - removing simple-patchsys - -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 + -- Didier Roche Wed, 22 Sep 2010 18:09:44 +0200 libindicator (0.3.13-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 32b0c1ce0db7b3955abd6d2192e89889170ec301 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 14:52:02 -0500 Subject: Autogen --- debian/changelog | 3 ++- tools/Makefile.in | 63 ++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8edbb3..ad3b567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libindicator (0.3.14-0ubuntu2~ppa1) UNRELEASED; urgency=low * Upstream Merge * Adding a small file to set debugging environment variables + * Autogen - -- Ted Gould Fri, 15 Oct 2010 14:48:22 -0500 + -- Ted Gould Fri, 15 Oct 2010 14:51:55 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low diff --git a/tools/Makefile.in b/tools/Makefile.in index 8c6b3b0..5e54885 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -45,7 +46,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(libexecdir)" +am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(xsessiondir)" PROGRAMS = $(libexec_PROGRAMS) am_indicator_loader_OBJECTS = \ indicator_loader-indicator-loader.$(OBJEXT) @@ -87,6 +88,28 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(indicator_loader_SOURCES) DIST_SOURCES = $(indicator_loader_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +DATA = $(xsession_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -231,6 +254,9 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ -lindicator +xsessiondir = $(sysconfdir)/X11/Xsession.d +xsession_DATA = 80indicator-debugging +EXTRA_DIST = $(xsession_DATA) all: all-am .SUFFIXES: @@ -365,6 +391,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-xsessionDATA: $(xsession_DATA) + @$(NORMAL_INSTALL) + test -z "$(xsessiondir)" || $(MKDIR_P) "$(DESTDIR)$(xsessiondir)" + @list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsessiondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(xsessiondir)" || exit $$?; \ + done + +uninstall-xsessionDATA: + @$(NORMAL_UNINSTALL) + @list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(xsessiondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(xsessiondir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -450,9 +496,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(libexecdir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(xsessiondir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -503,7 +549,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-xsessionDATA install-dvi: install-dvi-am @@ -549,7 +595,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libexecPROGRAMS +uninstall-am: uninstall-libexecPROGRAMS uninstall-xsessionDATA .MAKE: install-am install-strip @@ -561,11 +607,12 @@ uninstall-am: uninstall-libexecPROGRAMS install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-ps install-ps-am install-strip install-xsessionDATA \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libexecPROGRAMS + tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + uninstall-xsessionDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. -- cgit v1.2.3 From d6160f5deba95d4b915a53382e15610d39e81bbe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 14:54:32 -0500 Subject: debian/control: Adding package libindicator-debugenv --- debian/changelog | 3 ++- debian/control | 11 +++++++++++ debian/libindicator-debugenv.install | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 debian/libindicator-debugenv.install diff --git a/debian/changelog b/debian/changelog index ad3b567..19253bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libindicator (0.3.14-0ubuntu2~ppa1) UNRELEASED; urgency=low * Upstream Merge * Adding a small file to set debugging environment variables * Autogen + * debian/control: Adding package libindicator-debugenv - -- Ted Gould Fri, 15 Oct 2010 14:51:55 -0500 + -- Ted Gould Fri, 15 Oct 2010 14:54:17 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index d701099..5f33619 100644 --- a/debian/control +++ b/debian/control @@ -51,3 +51,14 @@ Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. + +Package: libindicator-debugenv +Section: devel +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicator1 (= ${binary:Version}) +Description: Debug environment for libindicator + Sets debug values useful for developers of applications using indicators. + . + This package contains session configuration files diff --git a/debian/libindicator-debugenv.install b/debian/libindicator-debugenv.install new file mode 100644 index 0000000..da1327b --- /dev/null +++ b/debian/libindicator-debugenv.install @@ -0,0 +1 @@ +debian/tmp/etc/* -- cgit v1.2.3 From 273cfcaccdfd2dcffc76b74fc5fe4c355919b606 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 14:56:17 -0500 Subject: releasing version 0.3.14-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19253bf..27231bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.14-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.14-0ubuntu2~ppa1) maverick; urgency=low * Upstream Merge * Adding a small file to set debugging environment variables * Autogen * debian/control: Adding package libindicator-debugenv - -- Ted Gould Fri, 15 Oct 2010 14:54:17 -0500 + -- Ted Gould Fri, 15 Oct 2010 14:56:11 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From e87aa8f4e30f315a8ce8acece383c50e32290481 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 14:44:56 -0600 Subject: releasing version 0.3.15-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dcfae79..aafd6ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.15-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.15-0ubuntu1~ppa1) maverick; urgency=low * 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:40:34 -0600 + -- Ted Gould Thu, 11 Nov 2010 14:44:51 -0600 libindicator (0.3.14-0ubuntu1) maverick; urgency=low -- 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 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 -- cgit v1.2.3 From 1bce6ba7fdb515b77cfc67b0f3c1809f9dc78faf Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 3 Dec 2010 13:14:42 -0500 Subject: releasing version 0.3.15-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 86b8a5b..6e67b9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.15-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.3.15-0ubuntu1) natty; urgency=low * debian/rules - Added build targets to build with gtk3 enabled in additional to -- cgit v1.2.3 From c5c78aad9e7710a18640ea44c2a5af154b2943bc Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 6 Dec 2010 10:34:22 -0500 Subject: releasing version 0.3.15-0ubuntu2 --- debian/changelog | 14 ++++++++++++++ debian/control | 11 ----------- debian/libindicator-debugenv.install | 1 - debian/libindicator-tools.install | 2 ++ tools/Makefile.am | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 debian/libindicator-debugenv.install diff --git a/debian/changelog b/debian/changelog index 6e67b9b..01246d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libindicator (0.3.15-0ubuntu2) natty; urgency=low + + * debian/control: + - dropped libindicator-debugenv package + * -debian/libindicator-debugenv.install + * debian/libindicator-tools.install + - Install indicator-loader and indicator-loader3 in the + libindicator-tools package (means it depends on both gtk2 and gtk3) + - Install sample xsession env in pkgdatadir for developer use + * tools/Makefile.am + - Install 80indicator-debugging in pkgdatadir + + -- Ken VanDine Mon, 06 Dec 2010 10:19:58 -0500 + libindicator (0.3.15-0ubuntu1) natty; urgency=low * debian/rules diff --git a/debian/control b/debian/control index a7e93cb..71082ea 100644 --- a/debian/control +++ b/debian/control @@ -54,17 +54,6 @@ Description: Tools for libindicator . This package contains files that are needed to build applications. -Package: libindicator-debugenv -Section: devel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicator1 (= ${binary:Version}) -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 diff --git a/debian/libindicator-debugenv.install b/debian/libindicator-debugenv.install deleted file mode 100644 index da1327b..0000000 --- a/debian/libindicator-debugenv.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/etc/* diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index 07cd88f..a95bc4b 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1 +1,3 @@ debian/tmp/usr/lib/libindicator/indicator-loader +debian/tmp/usr/lib/libindicator/indicator-loader3 +debian/tmp/usr/share/libindicator/80indicator-debugging diff --git a/tools/Makefile.am b/tools/Makefile.am index 9861ac1..795e4fc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -35,7 +35,7 @@ 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 -- cgit v1.2.3 From 8dd816058467151112b6ce7b51bd150042af1a9e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 14:45:12 -0600 Subject: debian/libindicator-tools: Removing indicator-loader3 --- debian/changelog | 6 ++++++ debian/libindicator-tools.install | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 01246d0..232f486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.15-0ubuntu3~ppa1) UNRELEASED; urgency=low + + * debian/libindicator-tools: Removing indicator-loader3 + + -- Ted Gould Wed, 08 Dec 2010 14:44:46 -0600 + libindicator (0.3.15-0ubuntu2) natty; urgency=low * debian/control: diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index a95bc4b..34f8177 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1,3 +1,2 @@ debian/tmp/usr/lib/libindicator/indicator-loader -debian/tmp/usr/lib/libindicator/indicator-loader3 debian/tmp/usr/share/libindicator/80indicator-debugging -- cgit v1.2.3 From d85d476295e45a3b686a7132f64d4f22c72d17b3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 14:46:28 -0600 Subject: debian/libindicator3-dev: Adding in the include files for this version of the library. --- debian/changelog | 4 +++- debian/libindicator3-dev.install | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 232f486..a41aaaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ libindicator (0.3.15-0ubuntu3~ppa1) UNRELEASED; urgency=low * debian/libindicator-tools: Removing indicator-loader3 + * debian/libindicator3-dev: Adding in the include files for this + version of the library. - -- Ted Gould Wed, 08 Dec 2010 14:44:46 -0600 + -- Ted Gould Wed, 08 Dec 2010 14:46:03 -0600 libindicator (0.3.15-0ubuntu2) natty; urgency=low diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index 2ac38b7..d11f81d 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,3 +1,4 @@ +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 -- cgit v1.2.3 From 356af1c196e3416444a14380eb5e25e999feb56d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 14:48:03 -0600 Subject: releasing version 0.3.15-0ubuntu3~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a41aaaa..c3bc20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.15-0ubuntu3~ppa1) UNRELEASED; urgency=low +libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low * debian/libindicator-tools: Removing indicator-loader3 * debian/libindicator3-dev: Adding in the include files for this version of the library. - -- Ted Gould Wed, 08 Dec 2010 14:46:03 -0600 + -- Ted Gould Wed, 08 Dec 2010 14:48:00 -0600 libindicator (0.3.15-0ubuntu2) natty; urgency=low -- cgit v1.2.3 From c6cd9bbac8998fa098c05dbd99c9f881e5d881e2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 14:18:24 -0600 Subject: autogen.sh --- Makefile.in | 5 +- aclocal.m4 | 7975 +--------------------------------------------- configure | 78 +- debian/changelog | 3 +- libindicator/Makefile.in | 60 +- tests/Makefile.in | 63 +- tools/Makefile.in | 53 +- 7 files changed, 172 insertions(+), 8065 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1dba7dc..c12d7bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ compile config.guess config.sub depcomp install-sh ltmain.sh \ missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/aclocal.m4 b/aclocal.m4 index 73870c8..32f5e2a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -19,7972 +19,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 56 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - -_LT_OUTPUT_LIBTOOL_INIT -]) - - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2008 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(lt_ECHO) -]) -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[[3-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${F77-"f77"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${FC-"f95"} - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC="$lt_save_CC" -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC="$lt_save_CC" -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF - ;; - esac -]) - -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) - -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) - -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# Generated from ltversion.in. - -# serial 3017 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) - -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 4 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -8122,7 +156,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -8133,7 +167,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -9187,3 +1221,8 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) diff --git a/configure b/configure index 817306d..adcffc5 100755 --- a/configure +++ b/configure @@ -8023,6 +8023,10 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -8048,11 +8052,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8055: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8055: \$? = $ac_status" >&5 + echo "$as_me:8059: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8387,11 +8391,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8390: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8394: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8394: \$? = $ac_status" >&5 + echo "$as_me:8398: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8492,11 +8496,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8495: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8499: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8499: \$? = $ac_status" >&5 + echo "$as_me:8503: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8547,11 +8551,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8550: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8554: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8554: \$? = $ac_status" >&5 + echo "$as_me:8558: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10931,7 +10935,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10934 "configure" +#line 10938 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11027,7 +11031,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11030 "configure" +#line 11034 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11512,17 +11516,14 @@ if test -n "$LIBINDICATOR_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION - gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 + gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5 + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -11534,17 +11535,14 @@ if test -n "$LIBINDICATOR_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION - gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 + gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5 + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -11565,19 +11563,16 @@ else fi if test $_pkg_short_errors_supported = yes; then LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` else LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBINDICATOR_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met: + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met: $LIBINDICATOR_PKG_ERRORS @@ -11623,17 +11618,14 @@ if test -n "$LIBINDICATOR_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION - gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 + gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5 + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -11645,17 +11637,14 @@ if test -n "$LIBINDICATOR_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION - gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 + gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION") 2>&5 + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -11676,19 +11665,16 @@ else fi if test $_pkg_short_errors_supported = yes; then LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` else LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBINDICATOR_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met: + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met: $LIBINDICATOR_PKG_ERRORS diff --git a/debian/changelog b/debian/changelog index 9e603be..ea3e445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libindicator (0.3.15-0ubuntu3~ppa2~gdbus1) UNRELEASED; urgency=low * Upstream Merge: * GDBus Port + * autogen.sh - -- Ted Gould Sun, 09 Jan 2011 14:14:32 -0600 + -- Ted Gould Sun, 09 Jan 2011 14:18:14 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in index 63e81e1..27c160f 100644 --- a/libindicator/Makefile.in +++ b/libindicator/Makefile.in @@ -58,7 +58,10 @@ DIST_COMMON = $(libindicator3include_HEADERS) \ $(srcdir)/indicator3.pc.in $(top_srcdir)/Makefile.am.marshal subdir = libindicator ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -94,6 +97,7 @@ am__DEPENDENCIES_1 = libindicator_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__objects_1 = am_libindicator_la_OBJECTS = $(am__objects_1) \ + libindicator_la-gen-indicator-service.xml.lo \ libindicator_la-indicator-object.lo \ libindicator_la-indicator-object-enum-types.lo \ libindicator_la-indicator-desktop-shortcuts.lo \ @@ -112,7 +116,9 @@ libindicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @USE_GTK3_FALSE@am_libindicator_la_rpath = -rpath $(libdir) am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) libindicator3_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -am__objects_2 = $(am__objects_1) libindicator3_la-indicator-object.lo \ +am__objects_2 = $(am__objects_1) \ + libindicator3_la-gen-indicator-service.xml.lo \ + libindicator3_la-indicator-object.lo \ libindicator3_la-indicator-object-enum-types.lo \ libindicator3_la-indicator-desktop-shortcuts.lo \ libindicator3_la-indicator-image-helper.lo \ @@ -290,7 +296,7 @@ top_srcdir = @top_srcdir@ @USE_GTK3_TRUE@lib_LTLIBRARIES = libindicator3.la BUILT_SOURCES = indicator-object-enum-types.h \ indicator-object-enum-types.c $(marshal_h) $(marshal_c) \ - $(DBUS_SPECS:.xml=-client.h) $(DBUS_SPECS:.xml=-server.h) + gen-indicator-service.xml.h gen-indicator-service.xml.c CLEANFILES = stamp-marshal indicator-object-enum-types.h \ indicator-object-enum-types.c s-enum-types-h s-enum-types-c \ $(BUILT_SOURCES) @@ -315,6 +321,8 @@ libindicatorinclude_HEADERS = \ libindicator_la_SOURCES = \ $(indicator_headers) \ dbus-shared.h \ + gen-indicator-service.xml.h \ + gen-indicator-service.xml.c \ indicator-object.c \ indicator-object-enum-types.c \ indicator-desktop-shortcuts.c \ @@ -333,7 +341,7 @@ libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) libindicator_la_LDFLAGS = \ - -version-info 1:0:0 \ + -version-info 2:0:0 \ -no-undefined \ -export-symbols-regex "^[^_].*" @@ -440,6 +448,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-desktop-shortcuts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-image-helper.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-object-enum-types.Plo@am__quote@ @@ -447,6 +456,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-service-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator3_la-indicator-service.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-gen-indicator-service.xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-indicator-desktop-shortcuts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-indicator-image-helper.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_la-indicator-object-enum-types.Plo@am__quote@ @@ -479,6 +489,14 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +libindicator_la-gen-indicator-service.xml.lo: gen-indicator-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-gen-indicator-service.xml.lo -MD -MP -MF $(DEPDIR)/libindicator_la-gen-indicator-service.xml.Tpo -c -o libindicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-gen-indicator-service.xml.Tpo $(DEPDIR)/libindicator_la-gen-indicator-service.xml.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-indicator-service.xml.c' object='libindicator_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c + libindicator_la-indicator-object.lo: indicator-object.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -MT libindicator_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libindicator_la-indicator-object.Tpo -c -o libindicator_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_la-indicator-object.Tpo $(DEPDIR)/libindicator_la-indicator-object.Plo @@ -535,6 +553,14 @@ libindicator_la-indicator-service-manager.lo: indicator-service-manager.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_la_CFLAGS) $(CFLAGS) -c -o libindicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c +libindicator3_la-gen-indicator-service.xml.lo: gen-indicator-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-gen-indicator-service.xml.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Tpo -c -o libindicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Tpo $(DEPDIR)/libindicator3_la-gen-indicator-service.xml.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-indicator-service.xml.c' object='libindicator3_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -c -o libindicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c + libindicator3_la-indicator-object.lo: indicator-object.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator3_la_CFLAGS) $(CFLAGS) -MT libindicator3_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libindicator3_la-indicator-object.Tpo -c -o libindicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator3_la-indicator-object.Tpo $(DEPDIR)/libindicator3_la-indicator-object.Plo @@ -894,7 +920,7 @@ $(marshal_c): $(marshal_h) 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) @@ -902,24 +928,20 @@ 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 -%-client.h: %.xml - dbus-binding-tool \ - --prefix=_$(subst -,_,$(basename $(notdir $<)))_client \ - --mode=glib-client \ - --output=$@ \ - $< - -%-server.h: %.xml - dbus-binding-tool \ - --prefix=_$(subst -,_,$(basename $(notdir $<)))_server \ - --mode=glib-server \ - --output=$@ \ - $< +gen-%.xml.h: %.xml + @echo "Building $@ from $<" + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + +gen-%.xml.c: %.xml + @echo "Building $@ from $<" + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + @echo ";" >> $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tests/Makefile.in b/tests/Makefile.in index fe1948a..967b364 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -49,7 +49,10 @@ check_PROGRAMS = test-loader$(EXEEXT) test-desktop-shortcuts$(EXEEXT) \ subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -128,7 +131,7 @@ am_service_manager_connect_OBJECTS = \ service_manager_connect_OBJECTS = \ $(am_service_manager_connect_OBJECTS) service_manager_connect_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_manager_connect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_manager_connect_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -137,7 +140,7 @@ am_service_manager_connect_service_OBJECTS = service_manager_connect_service-ser service_manager_connect_service_OBJECTS = \ $(am_service_manager_connect_service_OBJECTS) service_manager_connect_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_manager_connect_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_manager_connect_service_CFLAGS) $(CFLAGS) \ @@ -146,7 +149,7 @@ am_service_manager_no_connect_OBJECTS = service_manager_no_connect-service-manag service_manager_no_connect_OBJECTS = \ $(am_service_manager_no_connect_OBJECTS) service_manager_no_connect_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_manager_no_connect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_manager_no_connect_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -155,7 +158,7 @@ am_service_manager_nostart_connect_OBJECTS = service_manager_nostart_connect-ser service_manager_nostart_connect_OBJECTS = \ $(am_service_manager_nostart_connect_OBJECTS) service_manager_nostart_connect_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_manager_nostart_connect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_manager_nostart_connect_CFLAGS) $(CFLAGS) \ @@ -165,7 +168,7 @@ am_service_shutdown_timeout_OBJECTS = \ service_shutdown_timeout_OBJECTS = \ $(am_service_shutdown_timeout_OBJECTS) service_shutdown_timeout_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_shutdown_timeout_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_shutdown_timeout_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -174,7 +177,7 @@ am_service_version_bad_service_OBJECTS = service_version_bad_service-service-ver service_version_bad_service_OBJECTS = \ $(am_service_version_bad_service_OBJECTS) service_version_bad_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_version_bad_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_version_bad_service_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -183,7 +186,7 @@ am_service_version_good_service_OBJECTS = service_version_good_service-service-v service_version_good_service_OBJECTS = \ $(am_service_version_good_service_OBJECTS) service_version_good_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_version_good_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_version_good_service_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -192,7 +195,7 @@ am_service_version_manager_OBJECTS = service_version_manager-service-version-mul service_version_manager_OBJECTS = \ $(am_service_version_manager_OBJECTS) service_version_manager_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) service_version_manager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(service_version_manager_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -201,8 +204,7 @@ service_version_multiwatch_manager_SOURCES = \ service-version-multiwatch-manager.c service_version_multiwatch_manager_OBJECTS = service_version_multiwatch_manager-service-version-multiwatch-manager.$(OBJEXT) service_version_multiwatch_manager_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) service_version_multiwatch_manager_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(service_version_multiwatch_manager_CFLAGS) $(CFLAGS) \ @@ -211,8 +213,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \ service-version-multiwatch-manager-impolite.c service_version_multiwatch_manager_impolite_OBJECTS = service_version_multiwatch_manager_impolite-service-version-multiwatch-manager-impolite.$(OBJEXT) service_version_multiwatch_manager_impolite_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) service_version_multiwatch_manager_impolite_LINK = $(LIBTOOL) \ $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) \ @@ -222,8 +223,7 @@ am_service_version_multiwatch_service_OBJECTS = service_version_multiwatch_servi service_version_multiwatch_service_OBJECTS = \ $(am_service_version_multiwatch_service_OBJECTS) service_version_multiwatch_service_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) \ - $(top_builddir)/libindicator/.libs/libindicator.a + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) service_version_multiwatch_service_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(service_version_multiwatch_service_CFLAGS) $(CFLAGS) \ @@ -574,7 +574,8 @@ service_shutdown_timeout_CFLAGS = \ service_shutdown_timeout_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_manager_no_connect_SOURCES = \ service-manager-no-connect.c @@ -585,7 +586,8 @@ service_manager_no_connect_CFLAGS = \ service_manager_no_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_manager_connect_SOURCES = \ service-manager-connect.c @@ -596,7 +598,8 @@ service_manager_connect_CFLAGS = \ service_manager_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_manager_connect_service_SOURCES = \ service-manager-connect-service.c @@ -607,7 +610,8 @@ service_manager_connect_service_CFLAGS = \ service_manager_connect_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_version_manager_SOURCES = \ service-version-values.h \ @@ -619,7 +623,8 @@ service_version_manager_CFLAGS = \ service_version_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_version_bad_service_SOURCES = \ service-version-values.h \ @@ -631,7 +636,8 @@ service_version_bad_service_CFLAGS = \ service_version_bad_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_version_good_service_SOURCES = \ service-version-values.h \ @@ -643,7 +649,8 @@ service_version_good_service_CFLAGS = \ service_version_good_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_version_multiwatch_manager_CFLAGS = \ -Wall -Werror \ @@ -651,7 +658,8 @@ service_version_multiwatch_manager_CFLAGS = \ service_version_multiwatch_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_version_manager_impolite_SOURCES = \ service-version-values.h \ @@ -663,7 +671,8 @@ service_version_multiwatch_manager_impolite_CFLAGS = \ service_version_multiwatch_manager_impolite_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_version_multiwatch_service_SOURCES = \ service-version-values.h \ @@ -675,7 +684,8 @@ service_version_multiwatch_service_CFLAGS = \ service_version_multiwatch_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) service_manager_nostart_connect_SOURCES = \ service-manager-nostart-connect.c @@ -686,7 +696,8 @@ service_manager_nostart_connect_CFLAGS = \ service_manager_nostart_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - $(top_builddir)/libindicator/.libs/libindicator.a + -L$(top_builddir)/libindicator/.libs \ + $(INDICATOR_LIB) ############################# diff --git a/tools/Makefile.in b/tools/Makefile.in index f5a77ff..a72c8cb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -35,11 +35,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -libexec_PROGRAMS = indicator-loader$(EXEEXT) +@USE_GTK3_FALSE@libexec_PROGRAMS = indicator-loader$(EXEEXT) +@USE_GTK3_TRUE@libexec_PROGRAMS = indicator-loader3$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -61,6 +65,15 @@ indicator_loader_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(indicator_loader_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ +am__objects_1 = indicator_loader3-indicator-loader.$(OBJEXT) +am_indicator_loader3_OBJECTS = $(am__objects_1) +indicator_loader3_OBJECTS = $(am_indicator_loader3_OBJECTS) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +indicator_loader3_DEPENDENCIES = $(am__DEPENDENCIES_2) +indicator_loader3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(indicator_loader3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -87,8 +100,9 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(indicator_loader_SOURCES) -DIST_SOURCES = $(indicator_loader_SOURCES) +SOURCES = $(indicator_loader_SOURCES) $(indicator_loader3_SOURCES) +DIST_SOURCES = $(indicator_loader_SOURCES) \ + $(indicator_loader3_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -240,6 +254,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @USE_GTK3_FALSE@INDICATOR_LIB = -lindicator @USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3 +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 ############################# # Indicator Loader @@ -250,6 +266,7 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ @@ -257,6 +274,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 EXTRA_DIST = $(xsession_DATA) @@ -340,6 +365,9 @@ clean-libexecPROGRAMS: indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) @rm -f indicator-loader$(EXEEXT) $(AM_V_CCLD)$(indicator_loader_LINK) $(indicator_loader_OBJECTS) $(indicator_loader_LDADD) $(LIBS) +indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) + @rm -f indicator-loader3$(EXEEXT) + $(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -348,6 +376,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_loader-indicator-loader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_loader3-indicator-loader.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -389,6 +418,22 @@ indicator_loader-indicator-loader.obj: indicator-loader.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader_CFLAGS) $(CFLAGS) -c -o indicator_loader-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi` +indicator_loader3-indicator-loader.o: indicator-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -MT indicator_loader3-indicator-loader.o -MD -MP -MF $(DEPDIR)/indicator_loader3-indicator-loader.Tpo -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader3-indicator-loader.Tpo $(DEPDIR)/indicator_loader3-indicator-loader.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader3-indicator-loader.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.o `test -f 'indicator-loader.c' || echo '$(srcdir)/'`indicator-loader.c + +indicator_loader3-indicator-loader.obj: indicator-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -MT indicator_loader3-indicator-loader.obj -MD -MP -MF $(DEPDIR)/indicator_loader3-indicator-loader.Tpo -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_loader3-indicator-loader.Tpo $(DEPDIR)/indicator_loader3-indicator-loader.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-loader.c' object='indicator_loader3-indicator-loader.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_loader3_CFLAGS) $(CFLAGS) -c -o indicator_loader3-indicator-loader.obj `if test -f 'indicator-loader.c'; then $(CYGPATH_W) 'indicator-loader.c'; else $(CYGPATH_W) '$(srcdir)/indicator-loader.c'; fi` + mostlyclean-libtool: -rm -f *.lo -- cgit v1.2.3 From 7404425aa6b83ff99cad1b9b544893cdc6be3d65 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 14:21:19 -0600 Subject: debian/control: Migrating library versions from 1 to 2 --- debian/changelog | 3 ++- debian/control | 12 ++++++------ debian/libindicator1.install | 1 - debian/libindicator2.install | 1 + debian/libindicator3-1.install | 1 - debian/libindicator3-2.install | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 debian/libindicator1.install create mode 100644 debian/libindicator2.install delete mode 100644 debian/libindicator3-1.install create mode 100644 debian/libindicator3-2.install diff --git a/debian/changelog b/debian/changelog index ea3e445..2f2ec41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libindicator (0.3.15-0ubuntu3~ppa2~gdbus1) UNRELEASED; urgency=low * Upstream Merge: * GDBus Port * autogen.sh + * debian/control: Migrating library versions from 1 to 2 - -- Ted Gould Sun, 09 Jan 2011 14:18:14 -0600 + -- Ted Gould Sun, 09 Jan 2011 14:20:52 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index 71082ea..af14b30 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ 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 -Package: libindicator1 +Package: libindicator2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -36,7 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator1 (= ${binary:Version}) + libindicator2 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -48,13 +48,13 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator1 (= ${binary:Version}) + libindicator2 (= ${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-1 +Package: libindicator3-2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -71,7 +71,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk3.0-dev (>= 2.91.3), - libindicator3-1 (= ${binary:Version}) + libindicator3-2 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -83,7 +83,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-1 (= ${binary:Version}) + libindicator3-2 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator1.install b/debian/libindicator1.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator2.install b/debian/libindicator2.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator3-1.install b/debian/libindicator3-1.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-2.install b/debian/libindicator3-2.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* -- cgit v1.2.3 From 13a284ffccca8ae9f34b8659dbe4f4739ca5b780 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 14:29:54 -0600 Subject: Might need these --- libindicator/gen-indicator-service.xml.c | 23 +++++++++++++++++++++++ libindicator/gen-indicator-service.xml.h | 1 + 2 files changed, 24 insertions(+) create mode 100644 libindicator/gen-indicator-service.xml.c create mode 100644 libindicator/gen-indicator-service.xml.h diff --git a/libindicator/gen-indicator-service.xml.c b/libindicator/gen-indicator-service.xml.c new file mode 100644 index 0000000..2a2b590 --- /dev/null +++ b/libindicator/gen-indicator-service.xml.c @@ -0,0 +1,23 @@ +const char * _indicator_service = +"\n" +"\n" +" \n" +"\n" +" \n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"\n" +" \n" +"\n" +" \n" +"\n" +; diff --git a/libindicator/gen-indicator-service.xml.h b/libindicator/gen-indicator-service.xml.h new file mode 100644 index 0000000..057b5e6 --- /dev/null +++ b/libindicator/gen-indicator-service.xml.h @@ -0,0 +1 @@ +extern const char * _indicator_service; -- cgit v1.2.3 From bea872dbb0a63719d253d04c4236b707b12fee80 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 14:31:00 -0600 Subject: Marshaller fixes --- libindicator/indicator-object-marshal.c | 37 +++++++++++++++++++++++++++++++++ libindicator/indicator-object-marshal.h | 8 +++++++ 2 files changed, 45 insertions(+) diff --git a/libindicator/indicator-object-marshal.c b/libindicator/indicator-object-marshal.c index d5d526a..76a8cdf 100644 --- a/libindicator/indicator-object-marshal.c +++ b/libindicator/indicator-object-marshal.c @@ -163,3 +163,40 @@ _indicator_object_marshal_VOID__POINTER_UINT (GClosure *closure, data2); } +/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:4) */ +void +_indicator_object_marshal_VOID__POINTER_BOOLEAN (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN) (gpointer data1, + gpointer arg_1, + gboolean arg_2, + gpointer data2); + register GMarshalFunc_VOID__POINTER_BOOLEAN callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__POINTER_BOOLEAN) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_pointer (param_values + 1), + g_marshal_value_peek_boolean (param_values + 2), + data2); +} + diff --git a/libindicator/indicator-object-marshal.h b/libindicator/indicator-object-marshal.h index c34fa94..f2475b2 100644 --- a/libindicator/indicator-object-marshal.h +++ b/libindicator/indicator-object-marshal.h @@ -30,6 +30,14 @@ extern void _indicator_object_marshal_VOID__POINTER_UINT (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); +/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:4) */ +extern void _indicator_object_marshal_VOID__POINTER_BOOLEAN (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + G_END_DECLS #endif /* ___indicator_object_marshal_MARSHAL_H__ */ -- cgit v1.2.3 From 48fb94ff84ac33e33d81478eca82f361004c22f1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 15:01:36 -0600 Subject: Reverting this change made by distro --- tools/Makefile.am | 2 +- tools/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 9861ac1..795e4fc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -35,7 +35,7 @@ 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 diff --git a/tools/Makefile.in b/tools/Makefile.in index a72c8cb..9dd116f 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -282,7 +282,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 f8bea0d6cd9b82ad8708652efbc29d3787e9d41b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 15:03:14 -0600 Subject: releasing version 0.3.15-0ubuntu3~ppa2~gdbus1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f2ec41..c641c1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.15-0ubuntu3~ppa2~gdbus1) UNRELEASED; urgency=low +libindicator (0.3.15-0ubuntu3~ppa2~gdbus1) natty; urgency=low * Upstream Merge: * GDBus Port * autogen.sh * debian/control: Migrating library versions from 1 to 2 - -- Ted Gould Sun, 09 Jan 2011 14:20:52 -0600 + -- Ted Gould Sun, 09 Jan 2011 15:03:08 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low -- cgit v1.2.3 From 990356c47906309289377b57b5eec0298f30bcb6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 10 Jan 2011 11:54:57 -0600 Subject: debian/control: Dropping dbus-glib as a build-dep --- debian/changelog | 3 ++- debian/control | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2bd9528..6dc4d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libindicator (0.3.15-0ubuntu3~ppa2) UNRLEASED; urgency=low * GDBus Port * autogen.sh * debian/control: Migrating library versions from 1 to 2 + * debian/control: Dropping dbus-glib as a build-dep - -- Ted Gould Mon, 10 Jan 2011 11:52:20 -0600 + -- Ted Gould Mon, 10 Jan 2011 11:53:03 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index af14b30..17855cf 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 5.0), 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, -- cgit v1.2.3 From cf882252aba33dac210550441fcc9566ba0452c1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 10 Jan 2011 12:00:43 -0600 Subject: releasing version 0.3.15-0ubuntu3~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6dc4d20..546f24f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.15-0ubuntu3~ppa2) UNRLEASED; urgency=low +libindicator (0.3.15-0ubuntu3~ppa2) natty; urgency=low * Upstream Merge: * GDBus Port @@ -6,7 +6,7 @@ libindicator (0.3.15-0ubuntu3~ppa2) UNRLEASED; urgency=low * debian/control: Migrating library versions from 1 to 2 * debian/control: Dropping dbus-glib as a build-dep - -- Ted Gould Mon, 10 Jan 2011 11:53:03 -0600 + -- Ted Gould Mon, 10 Jan 2011 12:00:35 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low -- cgit v1.2.3 From 3f20962727b055458354b925dcb7e3ef0ad5a1d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 13 Jan 2011 12:47:47 -0600 Subject: Syncing to upstream --- Makefile.in | 5 +---- libindicator3-1.install | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 libindicator3-1.install diff --git a/Makefile.in b/Makefile.in index c12d7bc..1dba7dc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,10 +40,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ compile config.guess config.sub depcomp install-sh ltmain.sh \ missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/libindicator3-1.install b/libindicator3-1.install deleted file mode 100644 index aaa2e72..0000000 --- a/libindicator3-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* -- cgit v1.2.3 From b988044563fb4bec82d9d11d88a851f874f7b1ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 13 Jan 2011 12:49:29 -0600 Subject: releasing version 0.3.16-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4b426c4..f5b84c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.16-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.16-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * GDBus Port @@ -8,7 +8,7 @@ libindicator (0.3.16-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/libindicator3-dev: Adding in the include files for this version of the library. - -- Ted Gould Thu, 13 Jan 2011 12:45:16 -0600 + -- Ted Gould Thu, 13 Jan 2011 12:49:25 -0600 libindicator (0.3.15-0ubuntu2) natty; urgency=low -- cgit v1.2.3 From 7f4196b9052c27bda6ab407ad894b49ee52594ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Jan 2011 11:09:38 -0600 Subject: releasing version 0.3.17-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 461d173..b6d6421 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.17-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.17-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Fixing catching services dropping off - -- Ted Gould Fri, 14 Jan 2011 11:03:58 -0600 + -- Ted Gould Fri, 14 Jan 2011 11:09:36 -0600 libindicator (0.3.16-0ubuntu1) natty; urgency=low -- 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(-) 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 1246174af6fb0750bf72455fd3d10f30425562d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 15:31:07 -0600 Subject: releasing version 0.3.18-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4dc996..fbc5f7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.18-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.18-0ubuntu1~ppa1) natty; 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:29:02 -0600 + -- Ted Gould Thu, 27 Jan 2011 15:31:04 -0600 libindicator (0.3.17-0ubuntu1~ppa1) natty; urgency=low -- cgit v1.2.3 From 2dae441fca0caed55dddc37f9a056e3b6aa8b2b4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 10:23:46 -0600 Subject: debian/*: Changing the library major version from 2 to 3 --- debian/changelog | 3 ++- debian/control | 12 ++++++------ debian/libindicator2.install | 1 - debian/libindicator3-2.install | 1 - debian/libindicator3-3.install | 1 + debian/libindicator3.install | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 debian/libindicator2.install delete mode 100644 debian/libindicator3-2.install create mode 100644 debian/libindicator3-3.install create mode 100644 debian/libindicator3.install diff --git a/debian/changelog b/debian/changelog index 5a66acc..84753fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. โˆ˜ Adding in a11y description support โˆ˜ Fixing distcheck (LP: #587811) + * debian/*: Changing the library major version from 2 to 3 - -- Ted Gould Thu, 17 Feb 2011 10:20:50 -0600 + -- Ted Gould Thu, 17 Feb 2011 10:23:24 -0600 libindicator (0.3.18-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 4d0932f..4a138a8 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ 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 -Package: libindicator2 +Package: libindicator3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -36,7 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator2 (= ${binary:Version}) + libindicator3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -48,13 +48,13 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator2 (= ${binary:Version}) + libindicator3 (= ${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-2 +Package: libindicator3-3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -71,7 +71,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk3.0-dev (>= 2.91.3), - libindicator3-2 (= ${binary:Version}) + libindicator3-3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -83,7 +83,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-2 (= ${binary:Version}) + libindicator3-3 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator2.install b/debian/libindicator2.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator3-2.install b/debian/libindicator3-2.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-3.install b/debian/libindicator3-3.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3.install b/debian/libindicator3.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* -- cgit v1.2.3 From 4447040f1ad2c370a7532bb3ecb01fc7c0ab0da9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 10:25:54 -0600 Subject: debian/control: Adding Breaks for the previous library rev so that users don't end up with systems that use both. --- debian/changelog | 4 +++- debian/control | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 84753fe..e1df5b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low โˆ˜ Adding in a11y description support โˆ˜ Fixing distcheck (LP: #587811) * debian/*: Changing the library major version from 2 to 3 + * debian/control: Adding Breaks for the previous library rev + so that users don't end up with systems that use both. - -- Ted Gould Thu, 17 Feb 2011 10:23:24 -0600 + -- Ted Gould Thu, 17 Feb 2011 10:25:11 -0600 libindicator (0.3.18-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 4a138a8..03085a2 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator1 +Breaks: libindicator1 (<= ${binary:Version}), + libindicator2 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -59,6 +60,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libindicator3-2 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 6ca27e8cbf3246e2333bedfb466916299cb5cdaf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 10:27:18 -0600 Subject: releasing version 0.3.19-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1df5b6..fe711ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.19-0ubuntu1~ppa1) natty; urgency=low * New upstream release. โˆ˜ Adding in a11y description support @@ -7,7 +7,7 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Adding Breaks for the previous library rev so that users don't end up with systems that use both. - -- Ted Gould Thu, 17 Feb 2011 10:25:11 -0600 + -- Ted Gould Thu, 17 Feb 2011 10:27:14 -0600 libindicator (0.3.18-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 38d72805158b5d996b7661fa8d445352b4852f46 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Feb 2011 10:47:05 +1100 Subject: * debian/control: - Use new GTK3 package naming --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe711ee..813ae47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.19-0ubuntu2) natty; urgency=low + + * debian/control: + - Use new GTK3 package naming + + -- Robert Ancell Wed, 23 Feb 2011 10:46:46 +1100 + libindicator (0.3.19-0ubuntu1~ppa1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 03085a2..c408e18 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ 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), + libgtk-3-dev (>= 2.91.3), libtool, intltool, gtk-doc-tools, @@ -72,7 +72,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libindicator3-3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into -- cgit v1.2.3 From 58dbd1d4fe540ddd5bce899a6debbf2bc7270846 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 23 Feb 2011 08:50:33 -0500 Subject: releasing version 0.3.19-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1ad8a55..2a4cd6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.19-0ubuntu2) natty; urgency=low + + * debian/control: + - Use new build-depends for libgtk-3-dev + + -- Ken VanDine Wed, 23 Feb 2011 08:49:50 -0500 + libindicator (0.3.19-0ubuntu1) natty; urgency=low * debian/rules diff --git a/debian/control b/debian/control index 03085a2..7e47913 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ 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), + libgtk-3-dev (>= 2.91.3), libtool, intltool, gtk-doc-tools, -- cgit v1.2.3 From f41742762f73173d8f6254f29bc612a81b3412ab Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 23 Feb 2011 12:09:25 -0500 Subject: releasing version 0.3.19-0ubuntu3 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a4cd6f..90303c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.19-0ubuntu3) natty; urgency=low + + * debian/control + - More renaming of Depends to libgtk-3-dev + + -- Ken VanDine Wed, 23 Feb 2011 12:08:03 -0500 + libindicator (0.3.19-0ubuntu2) natty; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 7e47913..c408e18 100644 --- a/debian/control +++ b/debian/control @@ -72,7 +72,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libindicator3-3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into -- cgit v1.2.3 From 879dc15d5e6beaf53791e81c1e238d9cfc6469a4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 14:02:16 -0600 Subject: releasing version 0.3.20-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80388c4..b10d227 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.20-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.20-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Use the "TargetEnvironment" key in shortcuts - -- Ted Gould Thu, 03 Mar 2011 13:59:14 -0600 + -- Ted Gould Thu, 03 Mar 2011 14:02:12 -0600 libindicator (0.3.19-0ubuntu3) natty; urgency=low -- cgit v1.2.3 From b36a86701b639aee81a2599de7389419674d120c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 13:29:24 -0500 Subject: releasing version 0.3.21-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e3da0e..c5882d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.21-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.21-0ubuntu1~ppa1) natty; urgency=low * New upstream release. โˆ˜ Don't check for TargetEnvironment on the desktop group - -- Ted Gould Wed, 16 Mar 2011 13:22:47 -0500 + -- Ted Gould Wed, 16 Mar 2011 13:29:21 -0500 libindicator (0.3.20-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From a774a4119776cae6ff8bfe81b137ace75182273a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 22 Mar 2011 15:03:30 -0500 Subject: releasing version 0.3.21-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 399e111..e365fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.21-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.21-0ubuntu2~ppa1) natty; urgency=low * Upstream Merge * Adding the ability to know the environment the indicator object is in. - -- Ted Gould Tue, 22 Mar 2011 14:59:11 -0500 + -- Ted Gould Tue, 22 Mar 2011 15:03:28 -0500 libindicator (0.3.21-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 97e2fede61bdc63816f0ff2ccf1d5b1d58a13916 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Mar 2011 13:21:52 -0500 Subject: releasing version 0.3.22-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11e4dd1..2d8cb98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.22-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.22-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Adding the ability to know the environment the indicator object is in. (LP: #703555) - -- Ted Gould Wed, 23 Mar 2011 13:17:35 -0500 + -- Ted Gould Wed, 23 Mar 2011 13:21:49 -0500 libindicator (0.3.21-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 36fb97c7c97c3b40b48190e8e37b494bdff9edb9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 29 Jun 2011 11:06:26 +0100 Subject: releasing version 0.3.22-0ubuntu2 --- debian/changelog | 10 ++++++++++ debian/control | 5 +++-- debian/libindicator3-dev.install | 1 - 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7461b6d..54cdbc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 Wed, 29 Jun 2011 10:39:15 +0100 + libindicator (0.3.22-0ubuntu1) natty; urgency=low * New upstream release. 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 -- 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 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 24123eb5db81654167423780fc2d84f1de228bb3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 00:40:51 -0500 Subject: debian/*install: Fixing pkgconfig file names --- debian/changelog | 3 ++- debian/libindicator-dev.install | 4 ++-- debian/libindicator3-dev.install | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8a7008..3aa8cbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * 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 + * debian/*install: Fixing pkgconfig file names - -- Ted Gould Thu, 07 Jul 2011 00:37:34 -0500 + -- Ted Gould Thu, 07 Jul 2011 00:40:35 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index bbdcdeb..7f34ecd 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicator-0.3/libindicator/* -debian/tmp/usr/lib/pkgconfig/indicator.pc +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 diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index 2ac38b7..7381df0 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/pkgconfig/indicator3.pc +debian/tmp/usr/lib/pkgconfig/indicator3-0.4.pc debian/tmp/usr/lib/libindicator3.a debian/tmp/usr/lib/libindicator3.so -- cgit v1.2.3 From 8677620e7825d0ac249f5bc71210e4cf5dab53ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 08:29:41 -0500 Subject: releasing version 0.3.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3aa8cbc..5cc9fb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Build Fixes @@ -11,7 +11,7 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; 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 00:40:35 -0500 + -- Ted Gould Thu, 07 Jul 2011 08:29:37 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low -- 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 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 b414e0f54fb79b8131f13eb30a7d4e3e33c60472 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 11:12:59 -0400 Subject: releasing version 0.3.90-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eefe70a..5980954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.90-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.3.90-0ubuntu1) oneiric; urgency=low [ Ted Gould ] * New upstream release. -- cgit v1.2.3 From aad536423709ebbf17a728c3422b83b6f253914b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 Jul 2011 10:59:17 -0500 Subject: releasing version 0.3.90-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bec326f..8a50617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low +libindicator (0.3.90-0ubuntu2~ppa1) oneiric; urgency=low * Upstream Merge * Fix signals with NULL entries in the loader @@ -8,7 +8,7 @@ libindicator (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low * Fix testing so no tests are XFAIL anymore * Adding a replace mode for testing indicator services - -- Ted Gould Tue, 12 Jul 2011 10:55:26 -0500 + -- Ted Gould Tue, 12 Jul 2011 10:59:14 -0500 libindicator (0.3.90-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 798939969f32e2b11e781b4cdd82f13e69ddfae4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 Jul 2011 14:36:45 -0500 Subject: releasing version 0.3.90-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ec7300..9fa82bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.90-0ubuntu2~ppa2) UNRELEASED; urgency=low +libindicator (0.3.90-0ubuntu2~ppa2) oneiric; urgency=low * Upstream Merge * Watching new services when the name switches - -- Ted Gould Tue, 12 Jul 2011 14:35:18 -0500 + -- Ted Gould Tue, 12 Jul 2011 14:36:43 -0500 libindicator (0.3.90-0ubuntu2~ppa1) oneiric; urgency=low -- cgit v1.2.3 From 8641c27434f27843185299a6c76e70f2e87ff5d9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 14 Jul 2011 13:37:44 -0500 Subject: releasing version 0.3.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57f496b..cb814a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.91-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Fix signals with NULL entries in the loader @@ -9,7 +9,7 @@ libindicator (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Adding a replace mode for testing indicator services * Watching new services when the name switches - -- Ted Gould Thu, 14 Jul 2011 13:34:01 -0500 + -- Ted Gould Thu, 14 Jul 2011 13:37:42 -0500 libindicator (0.3.90-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 69b82366649b0fc6063cb058025694dab23c184f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 15 Jul 2011 09:43:58 -0400 Subject: releasing version 0.3.91-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cb814a0..2f7c73a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.91-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.3.91-0ubuntu1) oneiric; urgency=low * New upstream release. * Fix signals with NULL entries in the loader -- cgit v1.2.3 From 23239f8bdd4e54e98169edb1bad01b89f84f53ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Jul 2011 10:39:12 -0500 Subject: releasing version 0.3.92-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1499d83..d3b913f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.92-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.92-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Adding support for a secondary activate signal - -- Ted Gould Thu, 21 Jul 2011 10:19:06 -0500 + -- Ted Gould Thu, 21 Jul 2011 10:39:10 -0500 libindicator (0.3.91-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 24063df94ca4b5f4c9c80fd4f67744e9f65cabc3 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 21 Jul 2011 13:06:29 -0400 Subject: setting to UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d3b913f..496502c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.92-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.3.92-0ubuntu1) UNRELEASED; urgency=low * New upstream release. * Adding support for a secondary activate signal -- cgit v1.2.3 From 8ee4d7de06ce3128335c52202f1717b7eb80bec1 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 21 Jul 2011 13:14:27 -0400 Subject: releasing version 0.3.92-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 496502c..d61e379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.92-0ubuntu1) UNRELEASED; urgency=low +libindicator (0.3.92-0ubuntu1) oneiric; urgency=low * New upstream release. * Adding support for a secondary activate signal -- cgit v1.2.3 From 5600252dee9cd71ef58e51e3195f9bbce6c4b43e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Aug 2011 09:44:48 -0500 Subject: releasing version 0.3.93-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ca78f1..e6d553c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.93-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.93-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Rescan icon theme if icon can't be loaded - -- Ted Gould Thu, 11 Aug 2011 09:42:45 -0500 + -- Ted Gould Thu, 11 Aug 2011 09:44:35 -0500 libindicator (0.3.92-0ubuntu1~ppa1) oneiric; urgency=low -- cgit v1.2.3 From 4db9d2e01a6ad0a12f7c08f49e88ceaf86ebc1fb Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 11 Aug 2011 21:27:40 +0200 Subject: releasing version 0.3.93-0ubuntu1 --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a5aba7..c38339c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ libindicator (0.3.93-0ubuntu1) oneiric; urgency=low - * New upstream release. - * Rescan icon theme if icon can't be loaded + * debian/rules: + - update the translations template + + [ Ted Gould ] + * New upstream release -- Sebastien Bacher Thu, 11 Aug 2011 21:16:12 +0200 -- cgit v1.2.3 From 604acbf9ee30144f0a517e768b23830241675f47 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 1 Sep 2011 14:22:10 -0700 Subject: Drop the Breaks: against old versions of libindicator and libindicator3; there are no file conflicts between the libraries, so this doesn't accurately reflect the package relationships but does make it harder to calculate upgrades from natty. LP: #839098. --- debian/changelog | 9 +++++++++ debian/control | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c38339c..f21b16d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libindicator (0.3.93-0ubuntu2) UNRELEASED; urgency=low + + * Drop the Breaks: against old versions of libindicator and libindicator3; + there are no file conflicts between the libraries, so this doesn't + accurately reflect the package relationships but does make it harder to + calculate upgrades from natty. LP: #839098. + + -- Steve Langasek Thu, 01 Sep 2011 14:20:26 -0700 + libindicator (0.3.93-0ubuntu1) oneiric; urgency=low * debian/rules: diff --git a/debian/control b/debian/control index d9fbd97..06ee081 100644 --- a/debian/control +++ b/debian/control @@ -23,9 +23,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator1 (<= ${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. @@ -61,8 +58,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -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. -- cgit v1.2.3 From 130ebff768cb4fe0a1584bdbd9f7d3db7acde250 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 1 Sep 2011 14:22:14 -0700 Subject: releasing version 0.3.93-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f21b16d..0fa3e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.93-0ubuntu2) UNRELEASED; urgency=low +libindicator (0.3.93-0ubuntu2) oneiric; urgency=low * Drop the Breaks: against old versions of libindicator and libindicator3; there are no file conflicts between the libraries, so this doesn't accurately reflect the package relationships but does make it harder to calculate upgrades from natty. LP: #839098. - -- Steve Langasek Thu, 01 Sep 2011 14:20:26 -0700 + -- Steve Langasek Thu, 01 Sep 2011 14:22:12 -0700 libindicator (0.3.93-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 2867575084ee7586b1edac03b67526bc4bce2ee8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Sep 2011 21:54:34 -0500 Subject: releasing version 0.4.0-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7393f8..665a7d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.4.0-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.0-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Add libm to linking to fix FTBFS (LP: #840514) - -- Ted Gould Mon, 19 Sep 2011 21:43:31 -0500 + -- Ted Gould Mon, 19 Sep 2011 21:54:32 -0500 libindicator (0.3.93-0ubuntu2) oneiric; urgency=low -- cgit v1.2.3 From 4993a3cbe6a3c9615bba4ccd52367084d2f21f03 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 20 Sep 2011 09:37:24 -0700 Subject: releasing version 0.4.0-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 665a7d9..e69add8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.0-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.4.0-0ubuntu1) oneiric; urgency=low * New upstream release. * Add libm to linking to fix FTBFS (LP: #840514) -- cgit v1.2.3 From 80e619fe5ce6aac491e54efbffbaaeb876e50196 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Sep 2011 10:51:11 -0500 Subject: releasing version 0.4.1-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26d8a56..fa511c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.4.1-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Ensure loader doesn't use menu proxy - -- Ted Gould Wed, 28 Sep 2011 10:48:27 -0500 + -- Ted Gould Wed, 28 Sep 2011 10:51:08 -0500 libindicator (0.4.0-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 5834d280637a13ab389abea79de030a971b023e4 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 28 Sep 2011 12:14:30 -0400 Subject: releasing version 0.4.1-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa511c5..acc3613 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.4.1-0ubuntu1) oneiric; urgency=low * New upstream release. * Ensure loader doesn't use menu proxy -- 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 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 30ab1ed064f598d6b33289f7bd97b6ac97029e82 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 22 Nov 2011 14:39:48 -0500 Subject: * debian/control - set ubuntu-desktop VCS and maintainer --- debian/changelog | 7 +++++++ debian/control | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index be00b80..becf54c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.4.1-1ubuntu1) UNRELEASED; urgency=low + + * debian/control + - set ubuntu-desktop VCS and maintainer + + -- Ken VanDine Tue, 22 Nov 2011 14:39:15 -0500 + libindicator (0.4.1-1) experimental; urgency=low * Merge from Ubuntu. diff --git a/debian/control b/debian/control index 1dc79b8..06ee081 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: libindicator Section: libs Priority: optional -Maintainer: The Ayatana Packagers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), @@ -14,8 +15,8 @@ Build-Depends: debhelper (>= 5.0), dh-autoreconf Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian -Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator6 Section: libs -- cgit v1.2.3 From f131f1f92f2a91e9dcc52bc48fbfdfd0d62405ef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Jan 2012 10:15:31 -0600 Subject: debian/control: Bumping ABI version of lib --- debian/changelog | 3 ++- debian/control | 14 ++++++++------ debian/libindicator3-6.install | 1 - debian/libindicator3-7.install | 1 + debian/libindicator6.install | 1 - debian/libindicator7.install | 1 + 6 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 debian/libindicator3-6.install create mode 100644 debian/libindicator3-7.install delete mode 100644 debian/libindicator6.install create mode 100644 debian/libindicator7.install diff --git a/debian/changelog b/debian/changelog index 2977081..59b5533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ libindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Support hiding and showing indicators * Track the parent object in the entry * Adding activate function to include Window ID + * debian/control: Bumping ABI version of lib - -- Ted Gould Tue, 24 Jan 2012 10:08:58 -0600 + -- Ted Gould Tue, 24 Jan 2012 10:15:17 -0600 libindicator (0.4.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 06ee081..218cfe1 100644 --- a/debian/control +++ b/debian/control @@ -18,11 +18,12 @@ 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: libindicator6 +Package: libindicator7 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. @@ -35,7 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator6 (= ${binary:Version}) + libindicator7 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -47,17 +48,18 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator6 (= ${binary:Version}) + libindicator7 (= ${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-6 +Package: libindicator3-7 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. @@ -70,7 +72,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-6 (= ${binary:Version}), + libindicator3-7 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -83,7 +85,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-6 (= ${binary:Version}) + libindicator3-7 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator3-6.install b/debian/libindicator3-6.install deleted file mode 100644 index 75485eb..0000000 --- a/debian/libindicator3-6.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator3-7.install b/debian/libindicator3-7.install new file mode 100644 index 0000000..75485eb --- /dev/null +++ b/debian/libindicator3-7.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator6.install b/debian/libindicator6.install deleted file mode 100644 index c3bfad0..0000000 --- a/debian/libindicator6.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ diff --git a/debian/libindicator7.install b/debian/libindicator7.install new file mode 100644 index 0000000..c3bfad0 --- /dev/null +++ b/debian/libindicator7.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ -- cgit v1.2.3 From f64689abd26e93e6b7a0dcbd3abf33f100d6a05f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Jan 2012 10:17:02 -0600 Subject: releasing version 0.4.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59b5533..5804db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.90-0ubuntu1~ppa1) precise; urgency=low [ Ken VanDine ] * debian/control @@ -11,7 +11,7 @@ libindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Adding activate function to include Window ID * debian/control: Bumping ABI version of lib - -- Ted Gould Tue, 24 Jan 2012 10:15:17 -0600 + -- Ted Gould Tue, 24 Jan 2012 10:17:00 -0600 libindicator (0.4.1-1) experimental; urgency=low -- cgit v1.2.3 -- 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(-) 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 118a95aad977f3a624cd3b4527941e8b1b01f0e1 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 21:50:55 -0500 Subject: releasing version 0.4.90-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d3d483f..9437510 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.4.90-0ubuntu2) precise; urgency=low + + * debian/control + - dropped the Conflicts with libindicator6 and libindicator3-6 + + -- Ken VanDine Tue, 24 Jan 2012 21:44:30 -0500 + libindicator (0.4.90-0ubuntu1) precise; urgency=low [ Ted Gould ] 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. -- cgit v1.2.3 From a98a0b6e512e9082dfb90abc15e19d722d22dd71 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 25 Jan 2012 18:15:08 -0500 Subject: releasing version 0.4.90-0ubuntu3 --- debian/changelog | 7 +++++++ libindicator/indicator-object.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9437510..930b5b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.4.90-0ubuntu3) precise; urgency=low + + * libindicator/indicator-object.c + - basically disable the new visibility stuff because it breaks appmenus + + -- Ken VanDine Wed, 25 Jan 2012 18:08:31 -0500 + libindicator (0.4.90-0ubuntu2) precise; urgency=low * debian/control diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 849fb9f..efecfb5 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -756,7 +756,7 @@ indicator_object_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); - entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; + //entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; if (class->entry_being_removed != NULL) class->entry_being_removed (io, entry); @@ -768,7 +768,7 @@ indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * e g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); - entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; + //entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; if (class->entry_was_added != NULL) class->entry_was_added (io, entry); -- cgit v1.2.3 From b3398715b2dcb0dd78fba5f5323e672d3677d730 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 26 Jan 2012 00:37:14 -0500 Subject: releasing version 0.4.90-0ubuntu4 --- debian/changelog | 8 ++++++++ libindicator/indicator-object.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 930b5b3..af43b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libindicator (0.4.90-0ubuntu4) precise; urgency=low + + * libindicator/indicator-object.c + - revert disabling visibility, there is now a better fix for disappearing + in indicator-appmenu + + -- Ken VanDine Thu, 26 Jan 2012 00:24:06 -0500 + libindicator (0.4.90-0ubuntu3) precise; urgency=low * libindicator/indicator-object.c diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index efecfb5..849fb9f 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -756,7 +756,7 @@ indicator_object_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); - //entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; + entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; if (class->entry_being_removed != NULL) class->entry_being_removed (io, entry); @@ -768,7 +768,7 @@ indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * e g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); - //entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; + entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; if (class->entry_was_added != NULL) class->entry_was_added (io, entry); -- cgit v1.2.3 From b2a5f94bf7807e640d8b11dc33e0025c0f2036d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 11:52:00 -0600 Subject: Dropping debian/patches --- debian/changelog | 3 ++- debian/patches/debian-changes | 40 ---------------------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 0f1395f..090c203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Visibility fixes for indicators using that functionality * Ensure that parent_object is more aggressively set * Fix memory leak on groups of items in desktop files + * Dropping debian/patches - -- Ted Gould Tue, 14 Feb 2012 11:49:19 -0600 + -- Ted Gould Tue, 14 Feb 2012 11:51:52 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index 91e0322..0000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 7bb8252..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes -- 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(-) 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(-) 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 05f46d7e9a048f8427f3261ff3b52c0b9fdbcde7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:29:53 -0600 Subject: releasing version 0.4.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3232851..6b66327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Visibility fixes for indicators using that functionality @@ -11,7 +11,7 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Adding in autoreconf support * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:29:51 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low -- 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(+) 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 e5053aefa1301a8fa1ec795dbe45a56db2b01688 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 16:48:13 -0600 Subject: releasing version 0.4.91-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 56eade8..8a35d67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.4.91-0ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.4.91-0ubuntu1~ppa2) precise; urgency=low * debian/rules: Adding messages - -- Ted Gould Tue, 14 Feb 2012 16:44:09 -0600 + -- Ted Gould Tue, 14 Feb 2012 16:48:11 -0600 libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low -- cgit v1.2.3 From 0cad2e2fb913e79ef218d8175c90bc011855ca81 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 20:51:23 -0600 Subject: Increasing the test timeout to ensure that's not our issue --- debian/changelog | 6 ++++++ tests/service-manager-connect-service.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8a35d67..1b3239a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.4.91-0ubuntu1~ppa3) precise; urgency=low + + * Increasing the test timeout to ensure that's not our issue + + -- Ted Gould Tue, 14 Feb 2012 20:50:51 -0600 + libindicator (0.4.91-0ubuntu1~ppa2) precise; urgency=low * debian/rules: Adding messages diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index 7f57f96..09a7ba1 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -55,7 +55,7 @@ main (int argc, char ** argv) IndicatorService * is = indicator_service_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); - g_timeout_add_seconds(1, timeout, NULL); + g_timeout_add_seconds(5, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From a6436f6558c3603bfbe35543e436ec6e51d499e0 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 15 Feb 2012 13:09:01 +0100 Subject: Restore revision dropped by error, not sure what happened with the vcs --- configure.ac | 2 ++ debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac index 38dd416..3f33d52 100644 --- a/configure.ac +++ b/configure.ac @@ -52,10 +52,12 @@ AC_ARG_WITH([gtk], [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] diff --git a/debian/changelog b/debian/changelog index cb4f38a..985e1b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.4.91-0ubuntu3) UNRELEASED; urgency=low + + * Restore revision dropped by error, not sure what happened with the vcs + + -- Sebastien Bacher Wed, 15 Feb 2012 13:08:41 +0100 + libindicator (0.4.91-0ubuntu2) precise; urgency=low * Upstream Merge -- cgit v1.2.3 From 55ae52666c1c85127ba6d710ad2e02e0205e736c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 15 Feb 2012 13:13:03 +0100 Subject: releasing version 0.4.91-0ubuntu3 --- debian/changelog | 6 +++--- debian/source/format | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 985e1b4..2a8ae14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.4.91-0ubuntu3) UNRELEASED; urgency=low +libindicator (0.4.91-0ubuntu3) precise; urgency=low - * Restore revision dropped by error, not sure what happened with the vcs + * Restore revision dropped by error, change to format v1 for that - -- Sebastien Bacher Wed, 15 Feb 2012 13:08:41 +0100 + -- Sebastien Bacher Wed, 15 Feb 2012 13:09:05 +0100 libindicator (0.4.91-0ubuntu2) precise; urgency=low diff --git a/debian/source/format b/debian/source/format index 163aaf8..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 -- cgit v1.2.3 From c28e242fbc72697ba525e983cc74012bae80b6da Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 23 Feb 2012 00:27:41 -0600 Subject: releasing version 0.4.92-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 122d116..b49877c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.4.92-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.92-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Removing unenforcable consts (LP: #937387) * Explicitly add in gmodule as a required library - -- Ted Gould Thu, 23 Feb 2012 00:24:11 -0600 + -- Ted Gould Thu, 23 Feb 2012 00:27:38 -0600 libindicator (0.4.91-0ubuntu3) precise; urgency=low -- cgit v1.2.3 From 94c7bd6424040e4b6c6dcaaf89329ef66302d125 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 2 Mar 2012 13:18:44 +0100 Subject: releasing version 0.4.92-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 28b1449..c184137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.4.92-0ubuntu2) UNRELEASED; urgency=low +libindicator (0.4.92-0ubuntu2) precise; urgency=low * Backport support for the fdo desktop action spec, that's required to get unity lists to work with the new syntax (lp: #942042) - -- Sebastien Bacher Fri, 02 Mar 2012 12:04:21 +0100 + -- Sebastien Bacher Fri, 02 Mar 2012 12:08:09 +0100 libindicator (0.4.92-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From bbbe42afe728d7c9b447b11f88c049eafad9df52 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 7 Mar 2012 14:14:09 -0600 Subject: releasing version 0.4.93-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 712b384..2b046d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.4.93-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.93-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix branching past initialization of variables (LP: #939061) * Support new FD.o Desktop Actions (LP: #942042) * Fix valgrind error on unload (LP: #719457) - -- Ted Gould Wed, 07 Mar 2012 14:10:26 -0600 + -- Ted Gould Wed, 07 Mar 2012 14:14:07 -0600 libindicator (0.4.92-0ubuntu2) precise; urgency=low -- 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(-) 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 From 5ce6cdff07e9dbfd8e1aeeca4143fb64b617608a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 30 Mar 2012 09:57:26 -0400 Subject: releasing version 0.4.94-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fe0cbf6..5e95697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.94-0ubuntu1~ppa1) precise; urgency=low +libindicator (0.4.94-0ubuntu1) precise; urgency=low * New upstream release. * Fix a leaked GError (LP: #965459) -- cgit v1.2.3 From 486523c31460cb25606f2a4f66435c29df1946db Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 2 Apr 2012 11:07:25 +0200 Subject: Revert r457 it's creating invalid free errors --- debian/changelog | 6 ++++++ libindicator/indicator-service-manager.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e95697..008713a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.4.94-0ubuntu2) UNRELEASED; urgency=low + + * Revert r457 it's creating invalid free errors + + -- Sebastien Bacher Mon, 02 Apr 2012 11:06:50 +0200 + libindicator (0.4.94-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index 33b0557..f58c148 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -536,8 +536,8 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n { IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data); - gchar * new_name = NULL; - gchar * prev_name = NULL; + const gchar * new_name = NULL; + const gchar * prev_name = NULL; g_variant_get(parameters, "(&s&s&s)", NULL, &prev_name, &new_name); if (new_name == NULL || new_name[0] == 0) { @@ -571,9 +571,6 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n } } - g_free (new_name); - g_free (prev_name); - return; } -- cgit v1.2.3 From 4a445398a20768db826fbc245f9b2293176b8d88 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 2 Apr 2012 11:09:19 +0200 Subject: releasing version 0.4.94-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 008713a..ec0a103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (0.4.94-0ubuntu2) UNRELEASED; urgency=low +libindicator (0.4.94-0ubuntu2) precise; urgency=low * Revert r457 it's creating invalid free errors - -- Sebastien Bacher Mon, 02 Apr 2012 11:06:50 +0200 + -- Sebastien Bacher Mon, 02 Apr 2012 11:09:03 +0200 libindicator (0.4.94-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From f9220e124c672112cfaae5cf5c2a659dd9a84653 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Apr 2012 14:39:18 -0500 Subject: releasing version 0.4.95-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e57048..750fa33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.95-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.95-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix a free that shouldn't be (LP: #969360) @@ -6,7 +6,7 @@ libindicator (0.4.95-0ubuntu1~ppa1) UNRELEASED; urgency=low * Add coverage build targets * Fix building AUTHORS and Changelog at dist time - -- Ted Gould Wed, 04 Apr 2012 14:34:17 -0500 + -- Ted Gould Wed, 04 Apr 2012 14:39:16 -0500 libindicator (0.4.94-0ubuntu1~ppa1) precise; urgency=low -- cgit v1.2.3 From 696375c27b39b8f352bf967800e260b4ce73702e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Apr 2012 14:53:27 -0500 Subject: Fixing a merge artifact --- tools/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 795e4fc..cefd944 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,7 +19,6 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ - -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ -- cgit v1.2.3 From 752101a51a2011ab17aa9f56aa847e087b167b28 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Apr 2012 10:54:57 -0500 Subject: releasing version 0.5.0-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1418c7..1b1baf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.5.0-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.5.0-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Validate images in image_helper_update() (LP: #946408) - -- Charles Kerr Wed, 11 Apr 2012 10:51:35 -0500 + -- Charles Kerr Wed, 11 Apr 2012 10:54:42 -0500 libindicator (0.4.95-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From f26bd55b60d4a79df09881a37e36d53212ac1069 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 11 Apr 2012 14:13:19 -0400 Subject: releasing version 0.5.0-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b1baf7..9375c23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.5.0-0ubuntu1~ppa1) precise; urgency=low +libindicator (0.5.0-0ubuntu1) precise; urgency=low * New upstream release. * Validate images in image_helper_update() (LP: #946408) -- cgit v1.2.3 From bdeeb474ea13544a0848fa47bcafd3433ff1f85a Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 12 Jul 2012 17:44:58 +0200 Subject: releasing version 12.10.0-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e0d576a..73caa37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (12.10.0-0ubuntu1) UNRELEASED; urgency=low +libindicator (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release. - -- Sebastien Bacher Thu, 12 Jul 2012 17:36:01 +0200 + -- Sebastien Bacher Thu, 12 Jul 2012 17:44:46 +0200 libindicator (0.5.0-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From 2f35a94a59e3d4d27fb2d99a60c7d0eb31215bdc Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 17 Sep 2012 11:13:51 +0200 Subject: releasing version 12.10.0-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93df540..4c4bb17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low +libindicator (12.10.0-0ubuntu2) quantal; urgency=low * Backport a fix so that libroffice doesn't hang on on startup (LP: #1045372) - -- Didier Roche Mon, 17 Sep 2012 11:10:59 +0200 + -- Didier Roche Mon, 17 Sep 2012 11:13:49 +0200 libindicator (12.10.0-0ubuntu1) quantal; urgency=low -- cgit v1.2.3 From 96f010d993f596b0799a673cd19a4decdf08d8d4 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 19 Sep 2012 15:21:55 -0400 Subject: Import upstream version 12.10.1 --- AUTHORS | 1 + ChangeLog | 24 ++++++++++++++++ NEWS | 6 ++++ configure | 20 ++++++------- configure.ac | 2 +- libindicator/indicator-object.c | 64 ++--------------------------------------- tests/dummy-indicator-visible.c | 12 ++++++-- tests/test-loader.c | 24 +++++++++------- tools/indicator-loader.c | 59 ++++++++++++++++++++++--------------- 9 files changed, 103 insertions(+), 109 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0ff029e..37ff83f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,4 +22,5 @@ Robert Ancell Robert Carr Sebastien Bacher + Tarmac Ted Gould diff --git a/ChangeLog b/ChangeLog index 0dc633b..d374dab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ # Generated by Makefile. Do not edit. +2012-09-19 Charles Kerr + + 12.10.1 + +2012-09-12 Charles Kerr + + In libindicator, remove the cloak/decloak code in IndicatorObject to address Bug #1045372. + + In indicator-loader, support hiding & re-showing IndicatorObjectEntries by caching their menuitems and using gtk_widget_hide / gtk_widget_show. + + In tests/test-loader and tests/dummy-indicator-visible.c, support hiding & re-showing IndicatorObjectEntries by caching their parent widgetry instead of using gtk_widget_destroy().. Fixes: https://bugs.launchpad.net/bugs/1045372. Approved by Lars Uebernickel, jenkins. + +2012-09-11 Charles Kerr + + In tests/test-loader and tests/dummy-indicator-visible.c, support hiding & re-showing IndicatorObjectEntries by caching their parent widgetry instead of using gtk_widget_destroy() + +2012-09-11 Charles Kerr + + No newline at end of file + +2012-09-11 Charles Kerr + + remove the cloak/decloak widget logic + 2012-07-11 Charles Kerr bump version to 12.10.0 diff --git a/NEWS b/NEWS index a3fadf7..341c6fa 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +12.10.1 + + - merge lp:~charlesk/libindicator/lp-1045372 to remove the 'cloak' + code that caused libreoffice's menubars in unity to be greyed + out after opening any dialog or switching windows (lp: 1045372) + 12.10.0 - merge lp:~evgeni/libindicator/multiarch-same-devheaders so that we diff --git a/configure b/configure index 1d02975..7850a17 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libindicator 12.10.0. +# Generated by GNU Autoconf 2.69 for libindicator 12.10.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libindicator' PACKAGE_TARNAME='libindicator' -PACKAGE_VERSION='12.10.0' -PACKAGE_STRING='libindicator 12.10.0' +PACKAGE_VERSION='12.10.1' +PACKAGE_STRING='libindicator 12.10.1' PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator' PACKAGE_URL='http://launchpad.net/libindicator' @@ -1355,7 +1355,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libindicator 12.10.0 to adapt to many kinds of systems. +\`configure' configures libindicator 12.10.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1425,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libindicator 12.10.0:";; + short | recursive ) echo "Configuration of libindicator 12.10.1:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libindicator configure 12.10.0 +libindicator configure 12.10.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1823,7 +1823,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libindicator $as_me 12.10.0, which was +It was created by libindicator $as_me 12.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2646,7 +2646,7 @@ fi # Define the identity of the package. PACKAGE='libindicator' - VERSION='12.10.0' + VERSION='12.10.1' cat >>confdefs.h <<_ACEOF @@ -13086,7 +13086,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libindicator $as_me 12.10.0, which was +This file was extended by libindicator $as_me 12.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13153,7 +13153,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libindicator config.status 12.10.0 +libindicator config.status 12.10.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index fd14287..6c34ad0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [12.10.0], + [12.10.1], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index ca821af..ba2d377 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -113,9 +113,7 @@ static void get_property (GObject*, guint prop_id, GValue*, GParamSpec* ); /* entries' visibility */ static GList * get_entries_default (IndicatorObject*); static GList * get_all_entries (IndicatorObject*); -static void entry_being_removed_default (IndicatorObject*, IndicatorObjectEntry*); static void indicator_object_entry_being_removed (IndicatorObject*, IndicatorObjectEntry*); -static void entry_was_added_default (IndicatorObject*, IndicatorObjectEntry*); static void indicator_object_entry_was_added (IndicatorObject*, IndicatorObjectEntry*); static IndicatorObjectEntryPrivate * entry_get_private (IndicatorObject*, IndicatorObjectEntry*); @@ -141,8 +139,8 @@ indicator_object_class_init (IndicatorObjectClass *klass) klass->get_accessible_desc = NULL; klass->get_entries = get_entries_default; klass->get_location = NULL; - klass->entry_being_removed = entry_being_removed_default; - klass->entry_was_added = entry_was_added_default; + klass->entry_being_removed = NULL; + klass->entry_was_added = NULL; klass->entry_activate = NULL; klass->entry_activate_window = NULL; @@ -937,61 +935,3 @@ set_property (GObject * object, } } -/*** -**** -***/ - -/* Cloaked entries are ones which are hidden but may be re-added later. - They are reffed + unparented so that they'll survive even if the - rest of the widgetry is destroyed */ -#define CLOAKED_KEY "entry-is-cloaked" - -static void -decloak_widget (gpointer w) -{ - if (w != NULL) { - GObject * o = G_OBJECT(w); - if (g_object_steal_data (o, CLOAKED_KEY) != NULL) { - g_object_unref (o); - } - } -} - -static void -entry_was_added_default (IndicatorObject * io, IndicatorObjectEntry * entry) -{ - decloak_widget (entry->image); - decloak_widget (entry->label); - decloak_widget (entry->menu); -} - -static void -cloak_widget (gpointer w) -{ - if (w != NULL) { - GtkWidget * parent; - - /* tag this object as cloaked */ - GObject * o = G_OBJECT(w); - g_object_ref (o); - g_object_set_data (o, CLOAKED_KEY, GINT_TO_POINTER(1)); - - /* remove it from its surrounding widgetry */ - if(GTK_IS_MENU(w)) { - if (gtk_menu_get_attach_widget (GTK_MENU(w)) != NULL) { - gtk_menu_detach (GTK_MENU(w)); - } - } - else if((parent = gtk_widget_get_parent(w))) { - gtk_container_remove(GTK_CONTAINER(parent), w); - } - } -} - -static void -entry_being_removed_default (IndicatorObject * io, IndicatorObjectEntry * entry) -{ - cloak_widget (entry->image); - cloak_widget (entry->label); - cloak_widget (entry->menu); -} diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c index 0bb9e89..42cb59c 100644 --- a/tests/dummy-indicator-visible.c +++ b/tests/dummy-indicator-visible.c @@ -88,17 +88,25 @@ G_DEFINE_TYPE (DummyIndicatorVisible, dummy_indicator_visible, INDICATOR_OBJECT_ static void dummy_indicator_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry * entry) { + IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); + g_object_set_data(G_OBJECT(entry->label), "is-hidden", GINT_TO_POINTER(1)); - INDICATOR_OBJECT_CLASS(dummy_indicator_visible_parent_class)->entry_being_removed (io, entry); + if (indicator_object_class->entry_being_removed != NULL) { + indicator_object_class->entry_being_removed (io, entry); + } } static void dummy_indicator_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * entry) { + IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); + g_object_steal_data(G_OBJECT(entry->label), "is-hidden"); - INDICATOR_OBJECT_CLASS(dummy_indicator_visible_parent_class)->entry_was_added (io, entry); + if (indicator_object_class->entry_was_added != NULL) { + indicator_object_class->entry_was_added (io, entry); + } } static void diff --git a/tests/test-loader.c b/tests/test-loader.c index 28c56aa..45901cb 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -156,22 +156,24 @@ test_loader_filename_dummy_signaler (void) static void visible_entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box) { - // make a frame for the entry, and add the frame to the box - GtkWidget * frame = gtk_frame_new (NULL); - GtkWidget * child = GTK_WIDGET(entry->label); + GtkWidget * child = GTK_WIDGET (entry->label); g_assert (child != NULL); - gtk_container_add (GTK_CONTAINER(frame), child); - gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0); - g_object_set_data (G_OBJECT(child), "frame-parent", frame); + + if (g_object_get_data (G_OBJECT(child), "frame-parent") == NULL) + { + GtkWidget * frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER(frame), child); + gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0); + g_object_set_data (G_OBJECT(child), "frame-parent", frame); + } } static void visible_entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box) { - // destroy this entry's frame - gpointer parent = g_object_steal_data (G_OBJECT(entry->label), "frame-parent"); - if (GTK_IS_WIDGET(parent)) - gtk_widget_destroy(GTK_WIDGET(parent)); + GtkWidget * child = GTK_WIDGET (entry->label); + g_assert (child != NULL); + g_assert (g_object_get_data (G_OBJECT(child), "frame-parent") != NULL); } void @@ -218,7 +220,7 @@ test_loader_filename_dummy_visible (void) g_assert(GTK_IS_LABEL(label)); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) != NULL); list = gtk_container_get_children (GTK_CONTAINER(box)); - g_assert(g_list_length(list) == 0); + g_assert(g_list_length(list) == 1); g_list_free(list); // restore the entries and confirm that the label survived diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 10952dc..560fc45 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -25,6 +25,8 @@ License along with this library. If not, see #include #include +static GHashTable * entry_to_menuitem = NULL; + #define ENTRY_DATA_NAME "indicator-custom-entry-data" static void @@ -40,20 +42,18 @@ activate_entry (GtkWidget * widget, gpointer user_data) return; } -static void -entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) +static GtkWidget* +create_menu_item (IndicatorObjectEntry * entry) { - g_debug("Signal: Entry Added"); + GtkWidget * hbox; + GtkWidget * menuitem; - if (entry->parent_object == NULL) { - g_warning("Entry '%p' does not have a parent object", entry); - } + menuitem = gtk_menu_item_new(); - GtkWidget * menuitem = gtk_menu_item_new(); #if GTK_CHECK_VERSION(3,0,0) - GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); #else - GtkWidget * hbox = gtk_hbox_new(FALSE, 3); + hbox = gtk_hbox_new(FALSE, 3); #endif if (entry->image != NULL) { @@ -69,26 +69,34 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu)); } - g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(activate_entry), io); - - gtk_menu_shell_append(GTK_MENU_SHELL(user_data), menuitem); - gtk_widget_show(menuitem); - - g_object_set_data(G_OBJECT(menuitem), ENTRY_DATA_NAME, entry); - - return; + return menuitem; } static void -entry_removed_cb (GtkWidget * widget, gpointer userdata) +entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) { - gpointer data = g_object_get_data(G_OBJECT(widget), ENTRY_DATA_NAME); + GtkWidget * menuitem; + + g_debug("Signal: Entry Added"); - if (data != userdata) { - return; + if (entry->parent_object == NULL) { + g_warning("Entry '%p' does not have a parent object", entry); } - gtk_widget_destroy(widget); + menuitem = g_hash_table_lookup (entry_to_menuitem, entry); + if (menuitem == NULL) { + g_debug ("This is the first time this entry's been added -- creating a new menuitem for it"); + menuitem = create_menu_item (entry); + g_hash_table_insert (entry_to_menuitem, entry, menuitem); + + g_object_set_data(G_OBJECT(menuitem), ENTRY_DATA_NAME, entry); + g_signal_connect (G_OBJECT(menuitem), "activate", G_CALLBACK(activate_entry), io); + + gtk_menu_shell_append (GTK_MENU_SHELL(user_data), menuitem); + + } + gtk_widget_show (menuitem); + return; } @@ -97,7 +105,9 @@ entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user { g_debug("Signal: Entry Removed"); - gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry); + GtkWidget * menuitem = g_hash_table_lookup (entry_to_menuitem, entry); + if (menuitem != NULL) + gtk_widget_hide (menuitem); return; } @@ -162,6 +172,8 @@ main (int argc, char ** argv) gtk_init(&argc, &argv); + entry_to_menuitem = g_hash_table_new (g_direct_hash, g_direct_equal); + if (argc != 2) { g_error("Need filename"); return 1; @@ -183,5 +195,6 @@ main (int argc, char ** argv) gtk_main(); + g_hash_table_destroy (entry_to_menuitem); return 0; } -- cgit v1.2.3 From 7a3c457753530cf5073492d06a1b451e7930c570 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:21:42 -0500 Subject: Specify to bzr-builddeb to build the package in split mode. --- .bzr-builddeb/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf index 36c28f8..6c96a98 100644 --- a/.bzr-builddeb/default.conf +++ b/.bzr-builddeb/default.conf @@ -1,2 +1,2 @@ [BUILDDEB] -merge = False +split = True -- cgit v1.2.3 From 30aa94e03335dc768f18a1858b6be7f2aaeeb50b Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:25:01 -0500 Subject: * debian/control: - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. --- debian/changelog | 8 ++++++++ debian/control | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4204507..715e2f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low + + * debian/control: + - Reorganize Build-Depends for clarity. + - Update style to be consistent with other indicator stack packages. + + -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 + libindicator (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 998c41c..aab89ea 100644 --- a/debian/control +++ b/debian/control @@ -6,15 +6,15 @@ XSBC-Original-Maintainer: The Ayatana Packagers , Kartik Mistry Build-Depends: debhelper (>= 5.0), dh-autoreconf, - cdbs (>= 0.4.41), - libglib2.0-dev (>= 2.22), - libgtk2.0-dev (>= 2.18), - libgtk-3-dev (>= 2.91.3), libtool, intltool, gtk-doc-tools, dbus-test-runner, - xvfb + xvfb, + cdbs (>= 0.4.41), + libglib2.0-dev (>= 2.22), + libgtk2.0-dev (>= 2.18), + libgtk-3-dev (>= 2.91.3), Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu @@ -24,7 +24,7 @@ Package: libindicator7 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -37,7 +37,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator7 (= ${binary:Version}) + libindicator7 (= ${binary:Version}), Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -49,7 +49,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator7 (= ${binary:Version}) + libindicator7 (= ${binary:Version}), Description: Tools for libindicator Tools useful for developers of applications using indicators. . @@ -59,7 +59,7 @@ Package: libindicator3-7 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -73,7 +73,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), libindicator3-7 (= ${binary:Version}), - libindicator-dev (= ${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. @@ -85,7 +85,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-7 (= ${binary:Version}) + libindicator3-7 (= ${binary:Version}), Description: Tools for libindicator Tools useful for developers of applications using indicators. . -- cgit v1.2.3 From 9ec2a25350ecf32bfc2e308d598de49fd7fc69c6 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:25:36 -0500 Subject: Bump debhelper Build-Depends to (>= 9). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 715e2f8..368e11a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low * debian/control: - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. + - Bump debhelper Build-Depends to (>= 9). -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 diff --git a/debian/control b/debian/control index aab89ea..cd844b9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry -Build-Depends: debhelper (>= 5.0), +Build-Depends: debhelper (>= 9), dh-autoreconf, libtool, intltool, -- cgit v1.2.3 From 3d69e24bb732c8fc2196a523b0b8c659eb3e8f59 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:58:08 -0500 Subject: * debian/rules: - Convert to using the dh9 sequencer. --- debian/changelog | 2 ++ debian/rules | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 368e11a..8444808 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. - Bump debhelper Build-Depends to (>= 9). + * debian/rules: + - Convert to using the dh9 sequencer. -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 diff --git a/debian/rules b/debian/rules index 7cf6832..8df3a90 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,39 @@ #!/usr/bin/make -f -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 +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 +CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +CONFIGURE_FLAGS_gtk3 = --with-gtk=3 + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed export G_MESSAGES_DEBUG = all -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ +%: + dh $@ --with autoreconf -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) -#DEB_MAKE_CHECK_TARGET := check +doconfigure-%: + DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS_$*) -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +override_dh_auto_build: $(FLAVORS:%=dobuild-%) -DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_7 += -V 'libindicator3-7 (>= 0.4.90)' +dobuild-%: + dh_auto_build --builddirectory=builddir/$* -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) +override_dh_auto_install: $(FLAVORS:%=doinstall-%) -common-install-arch:: +doinstall-%: + dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* + +override_dh_install: find debian/tmp -name \*.la -delete - cd po; intltool-update --pot --verbose + find debian/tmp -name libdummy-indicator\* -delete + rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging + dh_install --fail-missing + +override_dh_makeshlibs: + dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)' + dh_makeshlibs -plibindicator3-7 -V 'libindicator3-7 (>= 0.4.90)' + -- cgit v1.2.3 From d1e3acb63a29ac2f2905d1ec5e0c09360bd7dffc Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:59:05 -0500 Subject: Drop Build-Depends on cdbs. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8444808..5326bff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. - Bump debhelper Build-Depends to (>= 9). + - Drop Build-Depends on cdbs. * debian/rules: - Convert to using the dh9 sequencer. diff --git a/debian/control b/debian/control index cd844b9..0f0f650 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, dbus-test-runner, xvfb, - cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), libgtk-3-dev (>= 2.91.3), -- cgit v1.2.3 From 568063937e43660dfede1b289bea5c258aa69e9c Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:59:47 -0500 Subject: Override dh_autoreconf to run autogen.sh and not call configure. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5326bff..dfb1d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Drop Build-Depends on cdbs. * debian/rules: - Convert to using the dh9 sequencer. + - Override dh_autoreconf to run autogen.sh and not call configure. -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 diff --git a/debian/rules b/debian/rules index 8df3a90..35b1bb9 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,9 @@ export G_MESSAGES_DEBUG = all %: dh $@ --with autoreconf +override_dh_autoreconf: + NOCONFIGURE=1 dh_autoreconf ./autogen.sh + override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) doconfigure-%: -- cgit v1.2.3 From e16a12634552cf2981a437cac745aa24359e9627 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 15:00:45 -0500 Subject: Add a Build-Depends on gnome-common. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index dfb1d58..9771710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Update style to be consistent with other indicator stack packages. - Bump debhelper Build-Depends to (>= 9). - Drop Build-Depends on cdbs. + - Add a Build-Depends on gnome-common. * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. diff --git a/debian/control b/debian/control index 0f0f650..9e8bc57 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, libtool, intltool, + gnome-common, gtk-doc-tools, dbus-test-runner, xvfb, -- cgit v1.2.3 From 1d6bc1dc2ce966ebfc26a842afd51f2d31a9b0b9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 02:30:41 -0500 Subject: Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. --- debian/changelog | 1 + debian/control | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9771710..97c5bfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Bump debhelper Build-Depends to (>= 9). - Drop Build-Depends on cdbs. - Add a Build-Depends on gnome-common. + - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. diff --git a/debian/control b/debian/control index 9e8bc57..beea51c 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,11 @@ Build-Depends: debhelper (>= 9), libgtk-3-dev (>= 2.91.3), 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 +# If you aren't a member of ~indicator-applet-developers but need to upload +# packaging changes, just go ahead. ~indicator-applet-developers will notice +# and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/trunk.13.04 +Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libindicator/trunk.13.04/files Package: libindicator7 Section: libs -- cgit v1.2.3 From 094593a4c1372f6d7caa86495b905c80780cbb36 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 02:31:06 -0500 Subject: debian/compat: bump compat level to 9. --- debian/changelog | 1 + debian/compat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 97c5bfc..f129b47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. + * debian/compat: bump compat level to 9. -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 -- cgit v1.2.3 From 5576bf0766de3a34922ebeb80e6268287b81a5b8 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 12:13:37 -0500 Subject: - Use calls to dh_install per-package to use the right source directories. * debian/*.install: drop the debian/tmp/gtk* path elements and update for multiarch. --- debian/changelog | 4 ++++ debian/libindicator-dev.install | 8 ++++---- debian/libindicator-tools.install | 4 ++-- debian/libindicator3-7.install | 2 +- debian/libindicator3-dev.install | 8 ++++---- debian/libindicator3-tools.install | 2 +- debian/libindicator7.install | 2 +- debian/rules | 7 ++++++- 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index f129b47..dbe6fad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,11 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. + - Use calls to dh_install per-package to use the right source + directories. * debian/compat: bump compat level to 9. + * debian/*.install: drop the debian/tmp/gtk* path elements and update for + multiarch. -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index 25c2128..fb02937 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -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/ +usr/include /usr/ +usr/lib/*/pkgconfig/indicator-0.4.pc +usr/lib/*/libindicator.a +usr/lib/*/libindicator.so diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index 20b86c8..a92f82e 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1,2 +1,2 @@ -debian/tmp/gtk2/usr/lib/libindicator/indicator-loader /usr/lib/libindicator/ -debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging /usr/share/libindicator/ +usr/lib/*/indicator-loader +usr/share/libindicator/80indicator-debugging /usr/share/libindicator/ diff --git a/debian/libindicator3-7.install b/debian/libindicator3-7.install index 75485eb..a4694a6 100644 --- a/debian/libindicator3-7.install +++ b/debian/libindicator3-7.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ +usr/lib/*/libindicator3.so.* diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index e556af3..866f3eb 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,4 +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/ +usr/include /usr/ +usr/lib/*/pkgconfig/indicator3-0.4.pc +usr/lib/*/libindicator3.a +usr/lib/*/libindicator3.so diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install index 47689fd..b73bb85 100644 --- a/debian/libindicator3-tools.install +++ b/debian/libindicator3-tools.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libindicator/indicator-loader3 /usr/lib/libindicator/ +usr/lib/*/indicator-loader3 diff --git a/debian/libindicator7.install b/debian/libindicator7.install index c3bfad0..4e561b8 100644 --- a/debian/libindicator7.install +++ b/debian/libindicator7.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ +usr/lib/*/libindicator.so.* /usr/lib/ diff --git a/debian/rules b/debian/rules index 35b1bb9..0ff1401 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,12 @@ override_dh_install: find debian/tmp -name \*.la -delete find debian/tmp -name libdummy-indicator\* -delete rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging - dh_install --fail-missing + dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3 + dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3 + dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3 override_dh_makeshlibs: dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)' -- cgit v1.2.3 From 93e0bd194387d998de428c326efe21eb92c57dfa Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 12:19:57 -0500 Subject: Add the proper Pre-Depends: multiarch to libindicator3-7. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index dbe6fad..51a40c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Drop Build-Depends on cdbs. - Add a Build-Depends on gnome-common. - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. + - Add the proper Pre-Depends: multiarch to libindicator3-7. * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. diff --git a/debian/control b/debian/control index beea51c..582965d 100644 --- a/debian/control +++ b/debian/control @@ -61,6 +61,7 @@ Description: Tools for libindicator Package: libindicator3-7 Section: libs Architecture: any +Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends}, Description: panel indicator applet - shared library -- cgit v1.2.3 From f77d6ddd288985780c7fb0c27911ccf4c2df4983 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 14:32:41 -0500 Subject: Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 51a40c8..0632495 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Override dh_autoreconf to run autogen.sh and not call configure. - Use calls to dh_install per-package to use the right source directories. + - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. * debian/compat: bump compat level to 9. * debian/*.install: drop the debian/tmp/gtk* path elements and update for multiarch. diff --git a/debian/rules b/debian/rules index 0ff1401..ec764bb 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ CONFIGURE_FLAGS_gtk3 = --with-gtk=3 LDFLAGS += -Wl,-z,defs -Wl,--as-needed export G_MESSAGES_DEBUG = all +export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: dh $@ --with autoreconf -- cgit v1.2.3