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 +++++++++++++------------------------- 11 files changed, 47 insertions(+), 51 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') 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 -- cgit v1.2.3