diff options
author | Ted Gould <ted@gould.cx> | 2011-08-31 13:38:17 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-08-31 13:38:17 -0500 |
commit | 3a3145da6af3fc186a536ead2d24b7035e1d82ba (patch) | |
tree | 4c6e62aaf2d540775532ecc6a0371b0097b4871d /debian | |
parent | b0eef117956490d332413394adb4bfec13218d8e (diff) | |
parent | 9e698820479b2854678ce985dfdd5383cbd29ab7 (diff) | |
download | ayatana-indicator-session-3a3145da6af3fc186a536ead2d24b7035e1d82ba.tar.gz ayatana-indicator-session-3a3145da6af3fc186a536ead2d24b7035e1d82ba.tar.bz2 ayatana-indicator-session-3a3145da6af3fc186a536ead2d24b7035e1d82ba.zip |
Update to Ubuntu Desktop
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 38 | ||||
-rw-r--r-- | debian/control | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/rules | 7 |
3 files changed, 47 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 2c062db..62a2e16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,41 @@ +indicator-session (0.3.3.2-0ubuntu1) oneiric; urgency=low + + * New upstream release. + - Don't set LC_ALL to C + * debian/rules + - dh_translations doesn't handle multibuilds, so manually add the domain + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Aug 2011 09:49:37 -0400 + +indicator-session (0.3.3.1-0ubuntu1) oneiric; urgency=low + + * New upstream release. + - Fixed string displayed for users name on single user systems + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 25 Aug 2011 15:25:40 -0400 + +indicator-session (0.3.3-0ubuntu2) oneiric; urgency=low + + * src/udev-mgr.c + - Cherry picked fix for (LP: #833795) + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 25 Aug 2011 12:56:17 -0400 + +indicator-session (0.3.3-0ubuntu1) oneiric; urgency=low + + * New upstream release. + - User menu should still show even if there is only 1 user (LP: #831758) + - Bluetooth item in menu not needed (LP: #825111) + - Newly created users are not added to the menu until next + login (LP: #552048) + - Users list in shutdown menu is not updated on user + deletion (LP: #557608) + - should use gsettings rather than gconf (LP: #656323) + * debian/control + - Bump dbusmenu build dep to >= 0.4.92 + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 25 Aug 2011 08:58:56 -0400 + indicator-session (0.3.2-0ubuntu2~ppa3) UNRELEASED; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index af1db07..b7b19de 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90), - libdbusmenu-gtk-dev (>= 0.3.94), - libdbusmenu-gtk3-dev (>= 0.3.94), + libdbusmenu-glib-dev (>= 0.4.92), + libdbusmenu-gtk-dev (>= 0.4.92), + libdbusmenu-gtk3-dev (>= 0.4.92), libpolkit-gobject-1-dev, intltool Standards-Version: 3.9.2 diff --git a/debian/rules b/debian/rules index 3691179..a393364 100755..100644 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,6 @@ 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/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ @@ -24,4 +23,10 @@ common-install-arch:: find debian/tmp -name \*.a -delete find debian/tmp -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 \ + sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ + echo "X-Ubuntu-Gettext-Domain=indicator-session" >> $$d; \ + done; + |