aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/compat2
-rw-r--r--debian/control9
-rw-r--r--debian/rules26
4 files changed, 23 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index 842487e..c87fa15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-session (12.10.1-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Menu items for users are too tall (lp: #1024395)
+ - should update glib requirement (lp: #1023533)
+ * Updating package to use current standards (dh9)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 23 Aug 2012 16:05:12 +0200
+
indicator-session (12.10.0-0ubuntu1) quantal; urgency=low
* New upstream release:
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 2a943d4..60f1bc3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: indicator-session
Section: gnome
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: debhelper (>= 5.0),
- cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 9),
+ dh-translations,
libgtk-3-dev,
libglib2.0-dev (>= 2.33),
libgconf2-dev,
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5.0),
libpackagekit-glib2-dev,
libpolkit-gobject-1-dev,
intltool
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
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
@@ -26,7 +26,8 @@ Depends: ${shlibs:Depends},
${misc:Depends},
upower,
gnome-settings-daemon
-Recommends: indicator-applet (>= 0.2) | indicator-renderer, packagekit-system-interface | packagekit
+Recommends: indicator-applet (>= 0.2) | indicator-renderer,
+ packagekit-system-interface | packagekit
Suggests: lightdm
Description: indicator showing session management, status and user switching
This indicator is designed to be placed on the right side of a panel and
diff --git a/debian/rules b/debian/rules
index 8534cd9..d010d87 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,12 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
-
-CFLAGS += -Wno-error=deprecated-declarations
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
-common-install-arch::
- 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/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;
+%:
+ dh $@ --with translations
+override_dh_auto_test:
+ echo "Disabling tests until they are fixed"
+override_dh_install:
+ find debian/indicator-session/usr/lib -name *.la -delete
+ find debian/indicator-session/usr/lib -name *.a -delete
+ dh_install --fail-missing