diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-07-31 09:59:11 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-07-31 09:59:11 -0500 |
| commit | 42034051b8a2856823fc6c2f5f80bea4cb3ea4fc (patch) | |
| tree | c1f9213ae4e479da688521b036d805d051be6e7f /debian | |
| parent | cbb4e95519f5127b152483b00731c260dc1a7670 (diff) | |
| parent | 97e7d1b81965388d66ae6aca0b1c19dc87d241e7 (diff) | |
| download | ayatana-indicator-datetime-42034051b8a2856823fc6c2f5f80bea4cb3ea4fc.tar.gz ayatana-indicator-datetime-42034051b8a2856823fc6c2f5f80bea4cb3ea4fc.tar.bz2 ayatana-indicator-datetime-42034051b8a2856823fc6c2f5f80bea4cb3ea4fc.zip | |
sync with lp:~charlesk/indicator-datetime/notification-refactor
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 24 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 21e1db3..121bbf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +indicator-datetime (13.10.0+14.10.20140725-0ubuntu1) utopic; urgency=low + + [ Mirco Müller ] + * Make use of the x-canonical-non-shaped-icon hint to suppress masking + the symbolic icon with an UbuntuShape. (LP: #1346925) + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 25 Jul 2014 08:55:41 +0000 + +indicator-datetime (13.10.0+14.10.20140718-0ubuntu1) utopic; urgency=low + + [ Charles Kerr ] + * make the gcc version explicit in debian/control and debian/rules. + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 18 Jul 2014 12:06:28 +0000 + indicator-datetime (13.10.0+14.10.20140716-0ubuntu1) utopic; urgency=low [ Charles Kerr ] diff --git a/debian/control b/debian/control index dab9096..15b981a 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,11 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> -# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales +# g++-4.9: since we use c++11 features, explicitly select a g++ version +# to protect from ABI breaks in libstdc++ +# language-pack-en-base: needed so unit tests can use 12h and 24h locales Build-Depends: cmake, + g++-4.9, dbus, dbus-test-runner, python3-dbusmock, diff --git a/debian/rules b/debian/rules index d2889aa..cf940f5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,10 @@ #!/usr/bin/make -f +# Explicitly selecting a G{CC,++}-version here to avoid accidental +# ABI breaks introduced by toolchain updates. +export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9 +export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9 + LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: |