Merge from U.Desktop

9 files changed, 157 insertions, 54 deletions

diff --git a/debian/changelog b/debian/changelog
index adcd7b0..3274121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libappindicator (0.2.92-0ubuntu2) natty; urgency=low
+
+  * debian/control, debian/rules
+    - Include new binaries for gtk3 builds
+  * debian/libappindicator1.symbols, debian/libappindicator3-1.symbols
+    - Added symbol files for libappindicator1 and libappdindicator3-1
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 08 Feb 2011 14:31:11 -0500
+
 libappindicator (0.2.92-0ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3292efd..73e285e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 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,
@@ -27,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
@@ -51,13 +55,25 @@ 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.
  .
  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: ${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
@@ -75,14 +91,49 @@ 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.
  .
  This package contains developer documentation.
 
+Package: libappindicator3-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Recommends: indicator-application (>= 0.2.93)
+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: ${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
@@ -113,16 +164,3 @@ Description: Application Indicators
  the panel.
  .
  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
-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.
diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install
index 0791348..13b1776 100644
--- a/debian/gir1.2-appindicator-0.1.install
+++ b/debian/gir1.2-appindicator-0.1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/*
+debian/tmp/usr/lib/girepository-1.0/AppIndicator-0.1.typelib
diff --git a/debian/gir1.2-appindicator3-0.1.install b/debian/gir1.2-appindicator3-0.1.install
new file mode 100644
index 0000000..54ce899
--- /dev/null
+++ b/debian/gir1.2-appindicator3-0.1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-1.0/AppIndicator3-0.1.typelib
diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install
index 28598a4..ddd4220 100644
--- a/debian/libappindicator-dev.install
+++ b/debian/libappindicator-dev.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/libappindicator-0.1/*
 debian/tmp/usr/lib/libappindicator.so
 debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc
-debian/tmp/usr/share/gir-1.0/*
-debian/tmp/usr/share/vala/vapi/*
+debian/tmp/usr/share/gir-1.0/AppIndicator-0.1.gir
+debian/tmp/usr/share/vala/vapi/AppIndicator-0.1.vapi
diff --git a/debian/libappindicator3-1.install b/debian/libappindicator3-1.install
new file mode 100644
index 0000000..8773436
--- /dev/null
+++ b/debian/libappindicator3-1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libappindicator3.so.*
diff --git a/debian/libappindicator3-1.symbols b/debian/libappindicator3-1.symbols
new file mode 100644
index 0000000..a4ceae6
--- /dev/null
+++ b/debian/libappindicator3-1.symbols
@@ -0,0 +1,24 @@
+libappindicator3.so.1 libappindicator3-1 #MINVER#
+ app_indicator_build_menu_from_desktop@Base 0.2.92
+ app_indicator_category_get_type@Base 0.2.92
+ app_indicator_get_attention_icon@Base 0.2.92
+ app_indicator_get_category@Base 0.2.92
+ app_indicator_get_icon@Base 0.2.92
+ app_indicator_get_icon_theme_path@Base 0.2.92
+ app_indicator_get_id@Base 0.2.92
+ app_indicator_get_label@Base 0.2.92
+ app_indicator_get_label_guide@Base 0.2.92
+ app_indicator_get_menu@Base 0.2.92
+ app_indicator_get_ordering_index@Base 0.2.92
+ app_indicator_get_status@Base 0.2.92
+ app_indicator_get_type@Base 0.2.92
+ app_indicator_new@Base 0.2.92
+ app_indicator_new_with_path@Base 0.2.92
+ app_indicator_set_attention_icon@Base 0.2.92
+ app_indicator_set_icon@Base 0.2.92
+ app_indicator_set_icon_theme_path@Base 0.2.92
+ app_indicator_set_label@Base 0.2.92
+ app_indicator_set_menu@Base 0.2.92
+ app_indicator_set_ordering_index@Base 0.2.92
+ app_indicator_set_status@Base 0.2.92
+ app_indicator_status_get_type@Base 0.2.92
diff --git a/debian/libappindicator3-dev.install b/debian/libappindicator3-dev.install
new file mode 100644
index 0000000..0d6700f
--- /dev/null
+++ b/debian/libappindicator3-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/libappindicator3.so
+debian/tmp/usr/lib/pkgconfig/appindicator3-0.1.pc
+debian/tmp/usr/share/gir-1.0/AppIndicator3-0.1.gir
+debian/tmp/usr/share/vala/vapi/AppIndicator3-0.1.vapi
diff --git a/debian/rules b/debian/rules
index 4c624b6..5394f82 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-$*
@@ -35,37 +34,20 @@ 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
+	dh_installdirs -ppython-appindicator 
+	dh_install -ppython-appindicator
 	touch $@
 
-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
+binary-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 {} \;
-
-binary-install/libappindicator0.1-cil::
-	dh_clistrip
-	dh_clifixperms
-	dh_makeclilibs -V
-	dh_installcligac
-
-binary-predeb/gir1.0-appindicator-0.1::
-	dh_girepository -p$(cdbs_curpkg)
-
-binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1
-	dh_clideps -plibappindicator0.1-cil
-
-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 $@
 
@@ -75,19 +57,63 @@ install-stamp:
 	$(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@
 
-install/libappindicator1:: install-stamp
+binary-install/libappindicator1:: install-stamp install-stamp-gtk3
+	dh_makeshlibs -plibappindicator1
+
+configure-stamp-gtk3:
+	: # configure for GTK+ 3.0
+	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-predeb/libappindicator1:: install-stamp
-	dh_fixperms
-	dh_strip
+configure/libappindicator3-1:: configure-stamp-gtk3
+
+build-stamp-gtk3:
+	: # build for GTK+ 3.0
+	$(MAKE) -C build-gtk3/src;
+	touch $@
+
+build/libappindicator3-1:: build-stamp-gtk3
+
+install-stamp-gtk3:
+	: # install for GTK+ 3.0
+	$(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install
+	touch $@
+
+binary-install/libappindicator3-1:: install-stamp-gtk3
+	dh_makeshlibs -plibappindicator3-1
+
+binary-install/libappindicator0.1-cil:: binary-fixup/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-binary-predeb-arch:: list-missing
 	dh_fixperms
 	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