releasing version 12.10.0-0ubuntu1

5 files changed, 19 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index 0859772..842487e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+indicator-session (12.10.0-0ubuntu1) quantal; urgency=low
+
+  * New upstream release:
+    - new design, merge user and session menus and drop devices entries
+  * debian/control.in:
+    - drop Build-depends on libgudev-1.0-devb
+    - drop gtk2 binary and Build-Depends
+    - replace outdated Conflicts, Replaces, Breaks after the LTS
+    - updated glib requirement
+  * debian/rules:
+    - drop the multibuild, we only build for gtk3
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 11 Jul 2012 19:53:28 +0200
+
 indicator-session (0.3.96-0ubuntu2) quantal; urgency=low
 
   * Recommend packagekit-system-interface instead of
diff --git a/debian/control b/debian/control
index a3ec11f..2a943d4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,13 @@ Priority: optional
 Maintainer: Ubuntu 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,
+               libglib2.0-dev (>= 2.33),
                libgconf2-dev,
                libdbus-glib-1-dev,
-               libgudev-1.0-dev,
                gnome-doc-utils,
-               libindicator-dev (>= 0.3.90),
                libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),
-               libdbusmenu-gtk-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libpackagekit-glib2-dev,
                libpolkit-gobject-1-dev,
@@ -31,9 +28,6 @@ Depends: ${shlibs:Depends},
          gnome-settings-daemon
 Recommends: indicator-applet (>= 0.2) | indicator-renderer, packagekit-system-interface | packagekit
 Suggests: lightdm
-Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
-Replaces: indicator-sus, indicator-me
-Breaks: indicator-me
 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.  
@@ -42,22 +36,3 @@ Description: indicator showing session management, status and user switching
  .
  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: lightdm
-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
- 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.
diff --git a/debian/indicator-session-gtk2.install b/debian/indicator-session-gtk2.install
deleted file mode 100644
index 8d1fc9f..0000000
--- a/debian/indicator-session-gtk2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-session.install b/debian/indicator-session.install
deleted file mode 100644
index 19a45de..0000000
--- a/debian/indicator-session.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/gtk3/usr /
diff --git a/debian/rules b/debian/rules
index 43ffda2..8534cd9 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,20 @@
 #!/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
 
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
-DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
-
-DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
-DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
 
 CFLAGS += -Wno-error=deprecated-declarations
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-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
+	find debian/indicator-session -name \*.la -delete
+	find debian/indicator-session -name \*.a -delete
+	find debian/indicator-session -name classic-desktop.sh | xargs chmod +x
 	cd po; intltool-update --pot --verbose
 	# Language packs
-	for d in $$(find debian/tmp -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
+	for d in $$(find debian/indicator-session -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
 		sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
 		echo "X-Ubuntu-Gettext-Domain=indicator-session" >> $$d; \
 	done;