diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-18 10:54:07 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-18 10:54:07 -0500 |
| commit | 5f16a749a9dbc3b951fffe1e5a3d5de47f7e91b7 (patch) | |
| tree | 1ac99c28e3520e8bae43d1bef3407b9b5603a302 | |
| parent | 52de3eb2a2a7cc6a1ed8272d85585f1463f836d9 (diff) | |
| parent | b4db559848359e10a5bda56c3dc8e8d24555a534 (diff) | |
| download | ayatana-indicator-messages-5f16a749a9dbc3b951fffe1e5a3d5de47f7e91b7.tar.gz ayatana-indicator-messages-5f16a749a9dbc3b951fffe1e5a3d5de47f7e91b7.tar.bz2 ayatana-indicator-messages-5f16a749a9dbc3b951fffe1e5a3d5de47f7e91b7.zip | |
Merge from U. Desktop
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 22 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index d1530ee..b677ff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,25 @@ -indicator-messages (0.4.93-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-messages (0.4.93-0ubuntu2) oneiric; urgency=low + * debian/rules + - run intltool-update to update the translations template + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 12 Aug 2011 10:05:01 -0400 + +indicator-messages (0.4.93-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] * New upstream release. * Add an item to clear the alert * Choose mail applications based on the default application * Clear based on middle click - -- Ted Gould <ted@ubuntu.com> Thu, 11 Aug 2011 09:28:30 -0500 + [ Ken VanDine ] + * debian/control + - Bumped build depends for libindicate to >= 0.5.90 + * debian/rules + - Fixed configure arg for gtk version + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 11 Aug 2011 14:18:05 -0400 indicator-messages (0.4.92-0ubuntu4) oneiric; urgency=low diff --git a/debian/control b/debian/control index a05ecff..ae1c8a3 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,9 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, scrollkeeper, intltool, - libindicate-dev (>= 0.4.91), - libindicate-gtk-dev (>= 0.4.91), + libindicate-dev (>= 0.5.90), + libindicate-gtk-dev (>= 0.5.90), + libindicate-gtk3-dev (>= 0.5.90), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.3.94), diff --git a/debian/rules b/debian/rules index 0105586..a2f4065 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,8 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -DEB_CONFIGURE_FLAGS_gtk2 = --with-indicator-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-indicator-gtk=3 +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 LDFLAGS += -Wl,-z,defs -Wl,--as-needed @@ -19,3 +19,4 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) common-install-arch:: find debian/tmp -name \*.la -delete + cd po; intltool-update --pot --verbose |