aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-08-26 10:44:10 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-08-26 10:44:10 -0400
commit9e698820479b2854678ce985dfdd5383cbd29ab7 (patch)
tree316d4fad0f91ac8333ba3fb921bed716fa01a392
parent0625c789127bf7685873791596a9d59cc6131af4 (diff)
parent455e7e483041b4641522a477ba00ca720b3a519c (diff)
downloadayatana-indicator-session-9e698820479b2854678ce985dfdd5383cbd29ab7.tar.gz
ayatana-indicator-session-9e698820479b2854678ce985dfdd5383cbd29ab7.tar.bz2
ayatana-indicator-session-9e698820479b2854678ce985dfdd5383cbd29ab7.zip
releasing version 0.3.3.2-0ubuntu1
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules6
-rw-r--r--src/session-service.c2
5 files changed, 18 insertions, 3 deletions
diff --git a/configure b/configure
index b3d04dc..9bc0aba 100755
--- a/configure
+++ b/configure
@@ -2745,7 +2745,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-session
- VERSION=0.3.3.1
+ VERSION=0.3.3.2
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 8584c96..8e5ed8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.3.1)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.3.2)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 2f54a40..77489ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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.
diff --git a/debian/rules b/debian/rules
index bee840d..a393364 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,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;
+
diff --git a/src/session-service.c b/src/session-service.c
index e16832c..753e304 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -97,7 +97,7 @@ main (int argc, char ** argv)
/* Setting up i18n and gettext. Apparently, we need
all of these. */
- setlocale (LC_ALL, "C");
+ setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
textdomain (GETTEXT_PACKAGE);