diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | 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 <mathieu-tl@ubuntu.com> 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)' + |