Sync to U. Desktop

5 files changed, 72 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 8e2a1af..8488373 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,36 @@
-indicator-session (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-session (0.2.90-0ubuntu3) oneiric; urgency=low
 
+  * Rebuild for libdbusmenu-gtk3-4
+  * debian/control
+    - Dropped build depends on indicator-session-gtk2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 28 Jun 2011 09:06:33 -0400
+
+indicator-session (0.2.90-0ubuntu2) oneiric; urgency=low
+
+  * debian/control
+    - Properly recommend indicator-session-gtk2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 23 Jun 2011 10:05:25 -0400
+
+indicator-session (0.2.90-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
   * New upstream release.
     * GTK3 support
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 21 Jun 2011 10:42:30 -0500
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped standards version to 3.9.2
+    - Add new binary for indicator-session-gtk2 
+    - Make indicator-session recommend indicator-session-gtk2 (until unity 
+      can load gtk3 indicators)
+    - indicator-session-gtk2 replaces indicator-session << 0.2.90
+    - Added build depends for libdbusmenu-gtk3-dev and libindicator3-dev
+  * debian/rules
+    - build for both gtk2 and gtk3
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 22 Jun 2011 12:18:18 -0400
 
 indicator-session (0.2.17-0ubuntu1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 5099fe5..cd7d6f2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,18 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.12.0),
+               libgtk-3-dev,
                libgconf2-dev,
                libdbus-glib-1-dev,
                gnome-doc-utils,
                libindicator-dev (>= 0.3.19),
-               libdbusmenu-glib-dev (>= 0.3.91),
-               libdbusmenu-gtk-dev (>= 0.3.91),
+               libindicator3-dev (>= 0.3.19),
+               libdbusmenu-glib-dev (>= 0.3.90),
+               libdbusmenu-gtk-dev (>= 0.3.94),
+               libdbusmenu-gtk3-dev (>= 0.3.94),
                libpolkit-gobject-1-dev,
                intltool
-Standards-Version: 3.8.2
+Standards-Version: 3.9.2
 Homepage: https://launchpad.net/indicator-session
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
@@ -25,8 +28,26 @@ Recommends: indicator-applet (>= 0.2) | indicator-renderer
 Suggests: gdm
 Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
 Replaces: indicator-sus
-Description: An indicator showing session management, status and user switching.
+Description: Indicator showing session management, status and user switching.
+ This indicator is designed to be placed on the right side of a panel and
+ give the user easy control for changing their instant message status.  
+ Switching to another user.  Starting a guest session.  Or controlling the
+ status of their own session.
  .
+ It requires some way to be hosted into a panel.  For the GNOME Panel the
+ appropriate package is indicator-applet-session.
+
+Package: indicator-session-gtk2
+Architecture: any
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends},
+         upower,
+         indicator-session (= ${binary:Version})
+Recommends: indicator-applet (>= 0.2) | indicator-renderer
+Suggests: gdm
+Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
+Replaces: indicator-session (<< 0.2.90)
+Description: Indicator showing session management, status and user switching.
  This indicator is designed to be placed on the right side of a panel and
  give the user easy control for changing their instant message status.  
  Switching to another user.  Starting a guest session.  Or controlling the
diff --git a/debian/indicator-session-gtk2.install b/debian/indicator-session-gtk2.install
new file mode 100644
index 0000000..8d1fc9f
--- /dev/null
+++ b/debian/indicator-session-gtk2.install
@@ -0,0 +1 @@
+debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-session.install b/debian/indicator-session.install
new file mode 100644
index 0000000..19a45de
--- /dev/null
+++ b/debian/indicator-session.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr /
diff --git a/debian/rules b/debian/rules
index 8db591a..c8bc001 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,24 @@
 #!/usr/bin/make -f
 
+DEB_BUILDDIR = build
+DEB_MAKE_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/simple-patchsys.mk
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
+DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
 
-DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
+DEB_CONFIGURE_FLAGS_gtk2 = --with-indicator-gtk=2
+DEB_CONFIGURE_FLAGS_gtk3 = --with-indicator-gtk=3
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
+
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-binary-install/indicator-session::
-	# remove .a/.la clutter
-	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
-	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la
+debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
+debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
 
+common-install-arch::
+	find debian/tmp -name \*.la -delete
+	find debian/tmp -name \*.a -delete
+	find debian/tmp -name classic-desktop.sh | xargs chmod +x