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/libindicator-dev.install | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/libindicator-dev.install (limited to 'debian/libindicator-dev.install') 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 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 (limited to '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 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 (limited to 'debian/libindicator-dev.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(-) (limited to 'debian/libindicator-dev.install') 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 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(-) (limited to 'debian/libindicator-dev.install') 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 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(-) (limited to 'debian/libindicator-dev.install') 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 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-dev.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-dev.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