diff options
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 23 | ||||
| -rw-r--r-- | debian/indicator-datetime-gtk2.install | 1 | ||||
| -rw-r--r-- | debian/indicator-datetime.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 25 |
5 files changed, 52 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index c949921..c1c6d23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low +indicator-datetime (0.2.90-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * New upstream release. - Set minimum width for appointments to prevent continuous resizing when the calendar is hiden and ensure there is enough of the @@ -10,7 +11,18 @@ indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low as merged upstream. * debian/control: Switching dep to libedataserverui-3.0-dev - -- Ted Gould <ted@ubuntu.com> Tue, 21 Jun 2011 14:29:24 -0500 + [ Ken VanDine ] + * debian/control + - Bumped standards version to 3.9.2 + - Add new binary for indicator-datetime-gtk2 + - Make indicator-datetime recommend indicator-datetime-gtk2 (until unity + can load gtk3 indicators) + - indicator-datetime-gtk2 replaces indicator-datetime << 0.2.90 + - Added build depends for libdbusmenu-gtk3-dev and libindicator3-dev + * debian/rules + - build for both gtk2 and gtk3 + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Jun 2011 11:46:55 -0400 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low diff --git a/debian/control b/debian/control index 47fc9c6..83819e0 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,11 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> Build-Depends: cdbs, debhelper (>= 5), intltool (>= 0.35.0), - libindicator-dev (>= 0.3.14), + libindicator-dev (>= 0.3.19), + libindicator3-dev (>= 0.3.19), libdbusmenu-glib-dev (>= 0.3.90), - libdbusmenu-gtk-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-gtk3-dev (>= 0.3.94), libglib2.0-dev (>= 2.25.0), libido-0.1-dev (>= 0.2.2), libido3-0.1-dev (>= 0.2.90), @@ -16,6 +18,7 @@ Build-Depends: cdbs, libecal1.2-dev (>= 2.30), libical-dev (>= 0.44), libgtk2.0-dev (>= 2.22), + libgtk-3-dev (>= 3.1.4), libcairo2-dev (>= 1.10), libjson-glib-dev, libunique-dev, @@ -24,7 +27,7 @@ Build-Depends: cdbs, libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), dh-autoreconf -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-datetime Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu @@ -33,7 +36,19 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, geoclue-ubuntu-geoip | geoclue-provider +Recommends: indicator-applet | indicator-renderer, + indicator-datetime-gtk2 +Description: Simple clock + A simple clock appearing in the indicator bar + +Package: indicator-datetime-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-datetime (= ${binary:Version}), + geoclue-ubuntu-geoip | geoclue-provider +Replaces: indicator-datetime (<< 0.2.90) Recommends: indicator-applet | indicator-renderer -Description: A very, very simple clock +Description: Simple clock A simple clock appearing in the indicator bar diff --git a/debian/indicator-datetime-gtk2.install b/debian/indicator-datetime-gtk2.install new file mode 100644 index 0000000..8d1fc9f --- /dev/null +++ b/debian/indicator-datetime-gtk2.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install new file mode 100644 index 0000000..19a45de --- /dev/null +++ b/debian/indicator-datetime.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr / diff --git a/debian/rules b/debian/rules index baf32ef..7950ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,23 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -install/indicator-datetime:: - find debian/indicator-datetime/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-datetime/usr/lib -name \*.a -exec rm {} \; +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-static + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) -common-binary-post-install-arch:: list-missing +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete |