diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-18 11:04:26 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-18 11:04:26 -0500 |
| commit | 6152054b12dca704e836a9863f2f9b242ea7e487 (patch) | |
| tree | e2eb5235c372b0dad5b27746c1f4767c027731ca | |
| parent | d0975614e095e07b839eebbfcb8ac14d8124c19b (diff) | |
| parent | 79f7355391b87f88f79330f4d7507ef72c15734c (diff) | |
| download | libayatana-indicator-6152054b12dca704e836a9863f2f9b242ea7e487.tar.gz libayatana-indicator-6152054b12dca704e836a9863f2f9b242ea7e487.tar.bz2 libayatana-indicator-6152054b12dca704e836a9863f2f9b242ea7e487.zip | |
Merging in Ubuntu Desktop branch
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 1283852..70fdc65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,21 @@ libindicator (0.3.12-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. * Removing a g_error that was breaking Unity on failed icons + * dropping workaround-icon-crash.patch: -- Ted Gould <ted@ubuntu.com> Wed, 18 Aug 2010 11:02:03 -0500 -libindicator (0.3.11-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.11-0ubuntu2) maverick; urgency=low + + * workaround-icon-crash.patch: + - change from Mikkel Kamstrup Erlandsen to workaround a crasher in the + new version + * debian/control: + - updated the gtk build requirement + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 13 Aug 2010 11:40:29 +0200 + +libindicator (0.3.11-0ubuntu1) maverick; urgency=low * New upstream release. * Allowing absolute paths in the image name (LP: #564034) diff --git a/debian/control b/debian/control index af01ed9..6530e9b 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org> Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), - libgtk2.0-dev (>= 2.12.0), + libgtk2.0-dev (>= 2.18), libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu diff --git a/debian/rules b/debian/rules index 151c78d..095f53b 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' + |