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/libindicator-tools.install | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/libindicator-tools.install (limited to 'debian/libindicator-tools.install') 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 8915dd59667cd7aae74860ee063374b24734e03c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Nov 2010 18:39:14 -0500 Subject: * debian/rules - Added build targets to build with gtk3 enabled in additional to default build with gtk2 * debian/control - Updated build depends to support building with gtk+-3.0 - Added dh-autoreconf build depends - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries binaries * libindicator/Makefile.am and tools/Makefile.am - Fixes needed for building with-gtk=3 --- debian/changelog | 16 +++++++++++++-- debian/control | 41 ++++++++++++++++++++++++++++++++++++-- debian/libindicator-tools.install | 2 +- debian/libindicator3-1.install | 1 + debian/libindicator3-dev.install | 3 +++ debian/libindicator3-tools.install | 1 + debian/rules | 31 +++++++++++++++++++++++++++- libindicator/Makefile.am | 4 ++-- libindicator3-1.install | 1 + tools/Makefile.am | 15 ++++++++++++-- 10 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 debian/libindicator3-1.install create mode 100644 debian/libindicator3-dev.install create mode 100644 debian/libindicator3-tools.install create mode 100644 libindicator3-1.install (limited to 'debian/libindicator-tools.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 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 (limited to 'debian/libindicator-tools.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(-) (limited to 'debian/libindicator-tools.install') 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 c292980b2487057592929d5b9b9c4446013241c5 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 10:55:25 -0400 Subject: * debian/rules - Simplify the dual builds with cdbs - Fixed package names to match soname * debian/*.install fixed paths to work with the dual builds change * tools/Makefile.in - Fixed path for xsessiondir * debian/control - Fixed package names to match soname --- debian/changelog | 15 ++++++++++-- debian/control | 12 +++++----- debian/libindicator-dev.install | 8 +++---- debian/libindicator-tools.install | 4 ++-- debian/libindicator3-4.install | 1 - debian/libindicator3-6.install | 1 + debian/libindicator3-dev.install | 6 ++--- debian/libindicator3-tools.install | 2 +- debian/libindicator4.install | 1 - debian/libindicator6.install | 1 + debian/rules | 47 +++++++++++++------------------------- tools/Makefile.in | 2 +- 12 files changed, 48 insertions(+), 52 deletions(-) delete mode 100644 debian/libindicator3-4.install create mode 100644 debian/libindicator3-6.install delete mode 100644 debian/libindicator4.install create mode 100644 debian/libindicator6.install (limited to 'debian/libindicator-tools.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 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(-) (limited to 'debian/libindicator-tools.install') 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