diff options
| author | Ted Gould <ted@gould.cx> | 2013-10-31 11:40:41 -0700 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2013-10-31 11:40:41 -0700 |
| commit | eb47d698341bc8f1b46433c48fc280d5a4906ad3 (patch) | |
| tree | 04e18a96bcad6c22f5079a517c5c8927d1ac49cd /debian | |
| parent | a4a5562fd93fdd6d9cb4b9cde98126fdca3ea21d (diff) | |
| parent | 0439dc69bfd71c42d01b7d11cb586ef056503b28 (diff) | |
| download | ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.tar.gz ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.tar.bz2 ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.zip | |
Merge trunk
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/indicator-datetime.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 10 |
4 files changed, 22 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index fc74793..8868dae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +indicator-datetime (13.10.0+13.10.20131023.2-0ubuntu1) saucy-proposed; urgency=low + + [ Marcus Tomlinson ] + * Fixed datetime title text to read "Date and Time" rather than the + day of the week (as per spec). (LP: #1236400) + + [ Lars Uebernickel ] + * Work around glib's type initialization deadlock. + https://bugzilla.gnome.org/show_bug.cgi?id=674885. (LP: #1239710) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 279 + + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 28 Oct 2013 14:59:27 -0400 + indicator-datetime (13.10.0+13.10.20131016.2-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/debian/control b/debian/control index 548f7b0..357b099 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,10 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> -Build-Depends: debhelper (>= 9), - quilt, - dh-autoreconf, +Build-Depends: cmake, + dbus, + debhelper (>= 9), + dh-translations, intltool (>= 0.35.0), gnome-common, libxorg-gtest-dev, diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install index a3076ee..1085d5f 100644 --- a/debian/indicator-datetime.install +++ b/debian/indicator-datetime.install @@ -1,6 +1,6 @@ usr/share/glib-2.0/schemas/* usr/share/upstart/sessions/* usr/share/unity/indicators/* -usr/lib/*/indicator-datetime-service +usr/lib/*/indicator-datetime/indicator-datetime-service usr/share/locale/* etc/xdg/autostart/* diff --git a/debian/rules b/debian/rules index 25854b8..0e7a91f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,17 +3,11 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: - dh $@ --with quilt,autoreconf - -override_dh_autoreconf: - NOCONFIGURE=1 dh_autoreconf ./autogen.sh - -override_dh_auto_configure: - dh_auto_configure -- --disable-static --disable-silent-rules + dh $@ --with translations override_dh_install: cd po; intltool-update --pot --verbose - dh_install -X.la --fail-missing + dh_install --fail-missing # Language packs for d in $$(find debian/indicator-datetime -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \ sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ |