diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-02-08 17:40:01 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-02-08 17:40:01 -0500 |
| commit | 625332ec9cf2a69a49b8008f666f67e9c909a38a (patch) | |
| tree | 166e72ab2ec60d114d66e5b75f664220d172aa9c | |
| parent | d0ad1b8460f6ea1a1c408b047590e33299e93591 (diff) | |
| download | libayatana-appindicator-625332ec9cf2a69a49b8008f666f67e9c909a38a.tar.gz libayatana-appindicator-625332ec9cf2a69a49b8008f666f67e9c909a38a.tar.bz2 libayatana-appindicator-625332ec9cf2a69a49b8008f666f67e9c909a38a.zip | |
more gtk3 build fixes
| -rw-r--r-- | debian/control | 7 | ||||
| -rwxr-xr-x | debian/rules | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/debian/control b/debian/control index a675dea..6f11a36 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-application (= ${binary:Version}) +Recommends: indicator-application (>= 0.2.93) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -90,8 +90,7 @@ Description: Application Indicators Package: libappindicator-doc Section: doc Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends} Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -103,7 +102,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-application (= ${binary:Version}) +Recommends: indicator-application (>= 0.2.93) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/rules b/debian/rules index edb1a2f..f808769 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export DH_VERBOSE = 1 - DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build @@ -16,6 +14,9 @@ include /usr/share/cdbs/1/rules/utils.mk API_VERSION = 0.1 +DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.2.91)' +DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 := -V 'libappindicator3-1 (>= 0.2.92)' + DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection configure-stamp-%: @@ -36,6 +37,8 @@ build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS)) install-stamp-%: PYTHON=`which $*` \ $(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp + dh_installdirs -ppython-appindicator + dh_install -ppython-appindicator touch $@ binary-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) @@ -58,6 +61,7 @@ install-stamp: touch $@ binary-install/libappindicator1:: install-stamp install-gtk3-stamp + dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator1 configure-gtk3-stamp: : # configure for GTK+ 3.0 @@ -86,6 +90,7 @@ install-gtk3-stamp: touch $@ binary-install/libappindicator3-1:: install-gtk3-stamp + dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip |