diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-22 21:37:34 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-22 21:37:34 -0500 |
| commit | 4398f67141ef4ec65a452ec0cf7fdee1ac349854 (patch) | |
| tree | d818a7fca573701b6386f0b846c299d21b8106eb /debian | |
| parent | 59b1902d1ca1e8fa946eb760825f6533fb3daac4 (diff) | |
| parent | f9c4e887cbeacc9a9dd457342205b1c783447cf4 (diff) | |
| download | ayatana-indicator-session-4398f67141ef4ec65a452ec0cf7fdee1ac349854.tar.gz ayatana-indicator-session-4398f67141ef4ec65a452ec0cf7fdee1ac349854.tar.bz2 ayatana-indicator-session-4398f67141ef4ec65a452ec0cf7fdee1ac349854.zip | |
Merging in from trunk packaging branch.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 1 |
3 files changed, 18 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 3223f2f..3faec71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,17 +6,28 @@ indicator-session (0.1.4-0ubuntu1~ppa2~mc1) karmic; urgency=low -- Ted Gould <ted@ubuntu.com> Tue, 22 Sep 2009 20:07:57 -0500 -indicator-session (0.1.4-0ubuntu1~ppa1) karmic; urgency=low +indicator-session (0.1.4-0ubuntu3~ppa1) karmic; urgency=low - * Upstream release 0.1.4 + * Merging in trunk (PK Changes) + * Removing patches 01_polkit-1.patch and 99_autoreconf.patch + as they were merged upstream. - -- Ted Gould <ted@ubuntu.com> Thu, 17 Sep 2009 11:08:07 -0500 + -- Ted Gould <ted@ubuntu.com> Tue, 22 Sep 2009 21:35:10 -0500 + +indicator-session (0.1.4-0ubuntu2) karmic; urgency=low + + * Add 01_polkit-1.patch: Port to polkit-1. (LP: #412601) + * Add 99_autoreconf.patch: Autoconf changes for above patch. + * debian/control: libpolkit-gnome-dev → libpolkit-gobject-1-dev -indicator-session (0.1.3-0ubuntu2~ppa1) karmic; urgency=low + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 22 Sep 2009 09:17:43 +0200 +indicator-session (0.1.4-0ubuntu1) karmic; urgency=low + + * Upstream release (LP: #432120) * Fixes to issues brought up by the design team. - -- Ted Gould <ted@ubuntu.com> Wed, 16 Sep 2009 16:14:34 -0500 + -- Ted Gould <ted@ubuntu.com> Thu, 17 Sep 2009 11:08:07 -0500 indicator-session (0.1.3-0ubuntu1) karmic; urgency=low diff --git a/debian/control b/debian/control index 9d36741..57aba13 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 5.0), libindicator-dev, libdbusmenu-glib-dev (>= 0.1.2), libdbusmenu-gtk-dev (>= 0.1.2), - libpolkit-gnome-dev, + libpolkit-gobject-1-dev, intltool, libempathy-dev (>= 2.27.0) Standards-Version: 3.8.2 diff --git a/debian/rules b/debian/rules index ce98752..b632517 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ 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 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed |