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/control | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 3292efd..7ed1cb9 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 7.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), + libgtk3.0-dev (>= 2.91.3), libdbus-glib-1-dev (>= 0.82), gnome-doc-utils, gtk-doc-tools, @@ -15,8 +16,10 @@ Build-Depends: debhelper (>= 7.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.14), + libindicator3-dev (>= 0.3.14), + libdbusmenu-glib-dev (>= 0.3.94), libdbusmenu-gtk-dev (>= 0.3.94), - libdbusmenu-glib-dev (>= 0.3.91), + libdbusmenu-gtk3-dev (>= 0.3.94), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, @@ -58,6 +61,19 @@ Description: Application Indicators . This package contains shared libraries to be used by applications. +Package: gir1.2-appindicator-0.1 +Conflicts: gir1.0-appindicator-0.1 +Replaces: gir1.0-appindicator-0.1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${gir:Depends} +Description: Typelib files for libappindicator1. + . + This package can be used by other packages using the GIRepository format + to generate dynamic bindings. + Package: libappindicator-dev Section: libdevel Architecture: any @@ -114,15 +130,42 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.2-appindicator-0.1 -Conflicts: gir1.0-appindicator-0.1 -Replaces: gir1.0-appindicator-0.1 +Package: libappindicator3-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: indicator-application (= ${binary:Version}) +Description: Application Indicators + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains shared libraries to be used by applications. + +Package: libappindicator3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-glib-dev (>= 0.1.8), + libdbus-glib-1-dev (>= 0.76), + libappindicator3-1 (= ${binary:Version}) +Description: Application Indicators + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains files that are needed to build applications. + +Package: gir1.2-appindicator3-0.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends} -Description: Typelib files for libappindicator1. +Description: Typelib files for libappindicator3-1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. + + + -- 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/control | 67 ++++++++++++++++++++++------------------------- debian/rules | 82 +++++++++++++++++++++------------------------------------- 2 files changed, 60 insertions(+), 89 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7ed1cb9..a675dea 100644 --- a/debian/control +++ b/debian/control @@ -66,8 +66,7 @@ Conflicts: gir1.0-appindicator-0.1 Replaces: gir1.0-appindicator-0.1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: ${misc:Depends}, ${gir:Depends} Description: Typelib files for libappindicator1. . @@ -99,37 +98,6 @@ Description: Application Indicators . This package contains developer documentation. -Package: libappindicator0.1-cil -Section: cli-mono -Architecture: all -Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil (<= 0.2.0-0ubuntu4) -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) -Provides: libappindicator0.0-cil -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends} -Description: CLI bindings for libappindicator - This package provides the appindicator-sharp assembly that allows CLI (.NET) - programs to take menus from applications and place them in the panel. - . - This package contains assemblies to be used by applications. - -Package: libappindicator0.1-cil-dev -Section: libdevel -Architecture: all -Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) -Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends}, - libappindicator0.1-cil (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains files that are needed to build applications. - Package: libappindicator3-1 Section: libs Architecture: any @@ -159,13 +127,40 @@ Description: Application Indicators Package: gir1.2-appindicator3-0.1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: ${misc:Depends}, ${gir:Depends} Description: Typelib files for libappindicator3-1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. +Package: libappindicator0.1-cil +Section: cli-mono +Architecture: all +Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), + libappindicator0.0-cil (<= 0.2.0-0ubuntu4) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) +Provides: libappindicator0.0-cil +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends} +Description: CLI bindings for libappindicator + This package provides the appindicator-sharp assembly that allows CLI (.NET) + programs to take menus from applications and place them in the panel. + . + This package contains assemblies to be used by applications. - +Package: libappindicator0.1-cil-dev +Section: libdevel +Architecture: all +Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) +Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends}, + libappindicator0.1-cil (= ${binary:Version}) +Description: Application Indicators + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains files that are needed to build applications. 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/control | 7 +++---- debian/rules | 9 +++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'debian/control') 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 -- 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/control | 1 + debian/rules | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6f11a36..73e285e 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,7 @@ Build-Depends: debhelper (>= 7.0), libgirepository1.0-dev, gir1.2-glib-2.0, gir1.2-gtk-2.0, + gir1.2-gtk-3.0, valac-0.12 Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator 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