From c7907613764c57dc8f423e9f75f703f75586152b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 14:32:48 -0500 Subject: * debian/control, debian/rules - Include new binaries for gtk3 builds - Added symbol files for libappindicator1 and libappdindicator3-1 --- debian/rules | 89 ++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 21 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4c624b6..08ea5b5 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,12 @@ export MONO_SHARED_DIR=$(CURDIR) export CSC=/usr/bin/mono-csc include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools-vars.mk +include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc API_VERSION = 0.1 -DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)' +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection configure-stamp-%: mkdir build-$* @@ -41,31 +40,48 @@ install-stamp-%: install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) -binary-predeb/python-appindicator:: - dh_python2 -ppython-appindicator - find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; - find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; +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 --enable-gtk-doc, $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS))) \ + --enable-gtk-doc=no; \ + cd ..; + touch $@ -binary-install/libappindicator0.1-cil:: - dh_clistrip - dh_clifixperms - dh_makeclilibs -V - dh_installcligac +configure/libappindicator3-1:: stamp-configure-gtk3 -binary-predeb/gir1.0-appindicator-0.1:: - dh_girepository -p$(cdbs_curpkg) +stamp-build-gtk3: + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3/src; + touch $@ -binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 - dh_clideps -plibappindicator0.1-cil +build/libappindicator3-1:: stamp-build-gtk3 + +stamp-install-gtk3: + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install + dh_installdirs -plibappindicator3-1 -s + dh_installdirs -plibappindicator3-dev -s + dh_installdirs -pgir1.2-appindicator3-0.1 -s + dh_install -plibappindicator3-1 -s + dh_install -plibappindicator3-dev -s + dh_install -pgir1.2-appindicator3-0.1 -s + touch $@ + +binary-install/libappindicator3-1:: stamp-install-gtk3 -configure-stamp: +configure-stamp: cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) + $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc touch $@ configure/libappindicator1:: configure-stamp -build-stamp: +build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ @@ -73,14 +89,45 @@ build/libappindicator1:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp + dh_installdirs -plibappindicator1 -s + dh_installdirs -plibappindicator-dev -s + dh_installdirs -plibappindicator-doc -s + dh_installdirs -pgir1.2-appindicator-0.1 -s + dh_install -plibappindicator1 -s + dh_install -plibappindicator-dev -s + dh_install -plibappindicator-doc -s + dh_install -pgir1.2-appindicator-0.1 -s touch $@ -install/libappindicator1:: install-stamp +binary-install/libappindicator1:: install-stamp + +binary-predeb/libappindicator1:: + dh_fixperms + dh_strip -binary-predeb/libappindicator1:: install-stamp +binary-predeb/libappindicator3-1:: binary-install/libappindicator3-1 dh_fixperms dh_strip +binary-install/libappindicator0.1-cil:: binary-install/libappindicator1 + dh_clistrip + dh_clifixperms + dh_makeclilibs -V + dh_installcligac + +binary-predeb/gir%:: + dh_girepository -p$(cdbs_curpkg) + +binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 + dh_clideps -plibappindicator0.1-cil + +binary-predeb/python-appindicator:: + dh_python2 -ppython-appindicator + find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; + find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; + +common-install-prehook-arch:: binary-install/libappindicator3-1 + common-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- cgit v1.2.3 From d0ad1b8460f6ea1a1c408b047590e33299e93591 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 16:40:57 -0500 Subject: gtk3 packaging fixes, still wip --- debian/rules | 82 +++++++++++++++++++++--------------------------------------- 1 file changed, 29 insertions(+), 53 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 08ea5b5..edb1a2f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DH_VERBOSE = 1 + DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build @@ -34,13 +36,30 @@ 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 -s - dh_install -ppython-appindicator -s touch $@ -install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) +binary-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) + +configure-stamp: + cd $(DEB_BUILDDIR) && \ + $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc + touch $@ + +configure/libappindicator1:: configure-stamp + +build-stamp: + $(MAKE) -C $(DEB_BUILDDIR) + touch $@ + +build/libappindicator1:: build-stamp -stamp-configure-gtk3: +install-stamp: + $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp + touch $@ + +binary-install/libappindicator1:: install-stamp install-gtk3-stamp + +configure-gtk3-stamp: : # configure for GTK+ 3.0 set -e; \ rm -rf build-gtk3; \ @@ -52,64 +71,23 @@ stamp-configure-gtk3: cd ..; touch $@ -configure/libappindicator3-1:: stamp-configure-gtk3 +configure/libappindicator3-1:: configure-gtk3-stamp -stamp-build-gtk3: +build-gtk3-stamp: : # build for GTK+ 3.0 $(MAKE) -C build-gtk3/src; touch $@ -build/libappindicator3-1:: stamp-build-gtk3 +build/libappindicator3-1:: build-gtk3-stamp -stamp-install-gtk3: +install-gtk3-stamp: : # install for GTK+ 3.0 $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install - dh_installdirs -plibappindicator3-1 -s - dh_installdirs -plibappindicator3-dev -s - dh_installdirs -pgir1.2-appindicator3-0.1 -s - dh_install -plibappindicator3-1 -s - dh_install -plibappindicator3-dev -s - dh_install -pgir1.2-appindicator3-0.1 -s - touch $@ - -binary-install/libappindicator3-1:: stamp-install-gtk3 - -configure-stamp: - cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc - touch $@ - -configure/libappindicator1:: configure-stamp - -build-stamp: - $(MAKE) -C $(DEB_BUILDDIR) - touch $@ - -build/libappindicator1:: build-stamp - -install-stamp: - $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp - dh_installdirs -plibappindicator1 -s - dh_installdirs -plibappindicator-dev -s - dh_installdirs -plibappindicator-doc -s - dh_installdirs -pgir1.2-appindicator-0.1 -s - dh_install -plibappindicator1 -s - dh_install -plibappindicator-dev -s - dh_install -plibappindicator-doc -s - dh_install -pgir1.2-appindicator-0.1 -s touch $@ -binary-install/libappindicator1:: install-stamp +binary-install/libappindicator3-1:: install-gtk3-stamp -binary-predeb/libappindicator1:: - dh_fixperms - dh_strip - -binary-predeb/libappindicator3-1:: binary-install/libappindicator3-1 - dh_fixperms - dh_strip - -binary-install/libappindicator0.1-cil:: binary-install/libappindicator1 +binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip dh_clifixperms dh_makeclilibs -V @@ -126,8 +104,6 @@ binary-predeb/python-appindicator:: find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; -common-install-prehook-arch:: binary-install/libappindicator3-1 - common-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- cgit v1.2.3 From 625332ec9cf2a69a49b8008f666f67e9c909a38a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 17:40:01 -0500 Subject: more gtk3 build fixes --- debian/rules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'debian/rules') 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 -- cgit v1.2.3 From ca3edb28872ce8e0c31e99beed3a19b562a9da14 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 21:39:11 -0500 Subject: fixup the clean target --- debian/rules | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f808769..f34e1ad 100755 --- a/debian/rules +++ b/debian/rules @@ -60,10 +60,10 @@ install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -binary-install/libappindicator1:: install-stamp install-gtk3-stamp +binary-install/libappindicator1:: install-stamp install-stamp-gtk3 dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator1 -configure-gtk3-stamp: +configure-stamp-gtk3: : # configure for GTK+ 3.0 set -e; \ rm -rf build-gtk3; \ @@ -75,21 +75,21 @@ configure-gtk3-stamp: cd ..; touch $@ -configure/libappindicator3-1:: configure-gtk3-stamp +configure/libappindicator3-1:: configure-stamp-gtk3 -build-gtk3-stamp: +build-stamp-gtk3: : # build for GTK+ 3.0 $(MAKE) -C build-gtk3/src; touch $@ -build/libappindicator3-1:: build-gtk3-stamp +build/libappindicator3-1:: build-stamp-gtk3 -install-gtk3-stamp: +install-stamp-gtk3: : # install for GTK+ 3.0 $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install touch $@ -binary-install/libappindicator3-1:: install-gtk3-stamp +binary-install/libappindicator3-1:: install-stamp-gtk3 dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 @@ -114,8 +114,10 @@ common-binary-predeb-arch:: list-missing dh_strip clean:: - -rm -rf $(addprefix build-, $(PY_VERSIONS)) - -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) + rm -f configure-stamp* + rm -f build-stamp* + rm -f install-stamp* + rm -rf build + rm -rf build-gtk3 + rm -rf build-python* rm -rf $(MONO_SHARED_DIR)/.wapi -- cgit v1.2.3 From b93c2b2980c187d7276994ea4974c1095e2179b4 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 22:14:58 -0500 Subject: Manually run dh_makeshlibs for libappindicator1 and libappindicator3-1 --- debian/rules | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f34e1ad..5394f82 100755 --- a/debian/rules +++ b/debian/rules @@ -14,9 +14,6 @@ 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-%: @@ -61,11 +58,10 @@ install-stamp: touch $@ binary-install/libappindicator1:: install-stamp install-stamp-gtk3 - dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator1 + dh_makeshlibs -plibappindicator1 configure-stamp-gtk3: : # configure for GTK+ 3.0 - set -e; \ rm -rf build-gtk3; \ mkdir build-gtk3; \ cd build-gtk3; \ @@ -90,7 +86,7 @@ install-stamp-gtk3: touch $@ binary-install/libappindicator3-1:: install-stamp-gtk3 - dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 + dh_makeshlibs -plibappindicator3-1 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip -- cgit v1.2.3