From 080af76066c8781b4b6dbfcc447c13fb0d1bb28c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 13 Dec 2013 11:57:58 -0600 Subject: ensure that we have 12h and 24h locales installed at build time -- the unit tests need them --- debian/control | 1 + debian/locale-gen | 31 +++++++++++++++++++++++++++++++ debian/rules | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 debian/locale-gen (limited to 'debian') diff --git a/debian/control b/debian/control index 357b099..ade7f2e 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Build-Depends: cmake, libgnome-control-center-dev, libtimezonemap1-dev, liburl-dispatcher1-dev, + locales, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-datetime # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/debian/locale-gen b/debian/locale-gen new file mode 100644 index 0000000..437dec5 --- /dev/null +++ b/debian/locale-gen @@ -0,0 +1,31 @@ +#!/bin/sh + +LOCPATH=`pwd`/locales +export LOCPATH + +[ -d $LOCPATH ] || mkdir -p $LOCPATH + +umask 022 + +echo "Generating locales..." +while read locale charset; do + case $locale in \#*) continue;; esac + [ -n "$locale" -a -n "$charset" ] || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`" + echo -n ".$charset" + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'` + echo -n '...' + if [ -f $LOCPATH/$locale ]; then + input=$locale + else + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'` + fi + localedef -i $input -c -f $charset $LOCPATH/$locale #-A /etc/locale.alias + echo ' done'; \ +done <> $$d; \ done; +override_dh_auto_test: + sh debian/locale-gen + LOCPATH="$(CURDIR)/locales" dh_auto_test -- cgit v1.2.3 From b91dc2ac50d421d29e22bac9c9564029ba64350d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 13 Dec 2013 12:20:58 -0600 Subject: try adding a build-dep of language-pack-en-base instead of configuring the locales in the unit test sandbox. (h/t seb) --- debian/control | 2 ++ debian/locale-gen | 31 ------------------------------- debian/rules | 3 --- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 debian/locale-gen (limited to 'debian') diff --git a/debian/control b/debian/control index ade7f2e..d9d4f56 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,14 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team +# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales Build-Depends: cmake, dbus, debhelper (>= 9), dh-translations, intltool (>= 0.35.0), gnome-common, + language-pack-en-base, libxorg-gtest-dev, libgtest-dev, libglib2.0-dev (>= 2.35.4), diff --git a/debian/locale-gen b/debian/locale-gen deleted file mode 100644 index 437dec5..0000000 --- a/debian/locale-gen +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -LOCPATH=`pwd`/locales -export LOCPATH - -[ -d $LOCPATH ] || mkdir -p $LOCPATH - -umask 022 - -echo "Generating locales..." -while read locale charset; do - case $locale in \#*) continue;; esac - [ -n "$locale" -a -n "$charset" ] || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`" - echo -n ".$charset" - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'` - echo -n '...' - if [ -f $LOCPATH/$locale ]; then - input=$locale - else - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'` - fi - localedef -i $input -c -f $charset $LOCPATH/$locale #-A /etc/locale.alias - echo ' done'; \ -done <> $$d; \ done; -override_dh_auto_test: - sh debian/locale-gen - LOCPATH="$(CURDIR)/locales" dh_auto_test -- cgit v1.2.3 From 707292ed0f2d5e55c718b1ed55d274a9ad5c2121 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 17 Dec 2013 09:49:56 +0000 Subject: Releasing 13.10.0+14.04.20131217-0ubuntu1, based on r291 --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e1509fd..5ceaecf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +indicator-datetime (13.10.0+14.04.20131217-0ubuntu1) trusty; urgency=low + + [ Charles Kerr ] + * Make the phone profile's header format sensitive to whether the + phone is running in a 12h or 24h locale, and use a 12h or 24h + notation accordingly. (LP: #1256061) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 291 + + -- Ubuntu daily release Tue, 17 Dec 2013 09:49:56 +0000 + indicator-datetime (13.10.0+14.04.20131125-0ubuntu1) trusty; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From 282993043650b14736443d9a100311c1fdd1f7d4 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 10 Jan 2014 14:45:41 +1300 Subject: Support both gnome-control-center and unity-control-center --- debian/control | 15 ++++++++++++++- debian/gnome-control-center-datetime.install | 4 ++-- debian/unity-control-center-datetime.install | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 debian/unity-control-center-datetime.install (limited to 'debian') diff --git a/debian/control b/debian/control index d9d4f56..3bd1fef 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Build-Depends: cmake, libedataserver1.2-dev (>= 3.5), libgconf2-dev (>= 2.31), libgnome-control-center-dev, + libunity-control-center-dev, libtimezonemap1-dev, liburl-dispatcher1-dev, locales, @@ -45,7 +46,7 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - gnome-control-center-datetime | ubuntu-system-settings, + gnome-control-center-datetime | unity-control-center-datetime | ubuntu-system-settings, Suggests: click, Conflicts: indicator-datetime (<< 13.10.0) Replaces: indicator-datetime (<< 13.10.0) @@ -64,3 +65,15 @@ Description: Clock settings in the GNOME Control Center A module to get date time and clock settings in the GNOME control center. +Package: unity-control-center-datetime +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-datetime (=${binary:Version}), + unity-control-center, +Conflicts: indicator-datetime (<< 13.10.0) +Replaces: indicator-datetime (<< 13.10.0) +Description: Clock settings in the Unity Control Center + A module to get date time and clock settings in the Unity control + center. + diff --git a/debian/gnome-control-center-datetime.install b/debian/gnome-control-center-datetime.install index 52a8c70..1551ef9 100644 --- a/debian/gnome-control-center-datetime.install +++ b/debian/gnome-control-center-datetime.install @@ -1,3 +1,3 @@ usr/lib/*/control-center-1/panels/* -usr/share/indicator-datetime/* -usr/share/applications/* +usr/share/indicator-datetime/gnome-control-center/* +usr/share/applications/gnome-indicator-datetime-panel.desktop diff --git a/debian/unity-control-center-datetime.install b/debian/unity-control-center-datetime.install new file mode 100644 index 0000000..d363e00 --- /dev/null +++ b/debian/unity-control-center-datetime.install @@ -0,0 +1,3 @@ +usr/lib/*/unity-control-center-1/panels/* +usr/share/indicator-datetime/unity-control-center/* +usr/share/applications/unity-datetime-panel.desktop -- cgit v1.2.3 From ad76159088202f6e4390843cfed6dd712b8e2544 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 14 Jan 2014 17:41:03 +1300 Subject: Recommend unity-control-center before gnome-control-center --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3bd1fef..0b9d12b 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - gnome-control-center-datetime | unity-control-center-datetime | ubuntu-system-settings, + unity-control-center-datetime | gnome-control-center-datetime | ubuntu-system-settings, Suggests: click, Conflicts: indicator-datetime (<< 13.10.0) Replaces: indicator-datetime (<< 13.10.0) -- cgit v1.2.3