aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-09 22:34:30 -0600
committerTed Gould <ted@gould.cx>2012-02-09 22:34:30 -0600
commitaed2d0094b438f51bf6fd6f9924a5924beaeaf29 (patch)
tree6fd1e0f18f1f63da533ac349f245f6d2f448468f
parentb4e4cfad7964bce931df142243e49a4ddce1f4c5 (diff)
parent4aacdd9668a570edcd9a8654865f147dcab396fe (diff)
downloadayatana-indicator-messages-aed2d0094b438f51bf6fd6f9924a5924beaeaf29.tar.gz
ayatana-indicator-messages-aed2d0094b438f51bf6fd6f9924a5924beaeaf29.tar.bz2
ayatana-indicator-messages-aed2d0094b438f51bf6fd6f9924a5924beaeaf29.zip
Merge from U. Desktop
-rw-r--r--debian/changelog18
-rwxr-xr-xdebian/rules1
2 files changed, 18 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0f2b356..45af689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,20 @@
-indicator-messages (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-messages (0.5.0-1ubuntu1) precise; urgency=low
+
+ * rebuild for libindicator7
+ * debian/rules
+ - build with no-error=deprecated-declarations
+ * debian/control
+ - set ubuntu-desktop VCS and maintainer
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 25 Jan 2012 09:56:59 -0500
+
+indicator-messages (0.5.0-1) experimental; urgency=low
+
+ * Merge new upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org> Wed, 19 Oct 2011 13:36:00 +0200
+
+indicator-messages (0.5.0-0ubuntu1) oneiric; urgency=low
* New upstream release.
* Fix memory leak (LP: #690668)
diff --git a/debian/rules b/debian/rules
index a2f4065..4eae6c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
+CFLAGS += -Wno-error=deprecated-declarations
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)