diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/libindicator3-4.install (renamed from debian/libindicator3-3.install) | 0 | ||||
| -rw-r--r-- | debian/libindicator4.install (renamed from debian/libindicator3.install) | 0 | ||||
| -rwxr-xr-x | debian/rules | 40 |
5 files changed, 33 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog index bdba7bd..e8a7008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618) + * debian/*install, control: Changing ABI version number bump in package names + * debian/rules: Making GTK2 the special case as GTK3 is default now - -- Ted Gould <ted@ubuntu.com> Thu, 07 Jul 2011 00:28:56 -0500 + -- Ted Gould <ted@ubuntu.com> Thu, 07 Jul 2011 00:37:34 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index 5d03e92..c7cb436 100644 --- a/debian/control +++ b/debian/control @@ -18,13 +18,14 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Package: libindicator3 +Package: libindicator4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libindicator1 (<= ${binary:Version}), - libindicator2 (<= ${binary:Version}) + libindicator2 (<= ${binary:Version}), + libindicator3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -37,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -49,18 +50,19 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-3 +Package: libindicator3-4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator3-2 (<= ${binary:Version}) +Breaks: libindicator3-2 (<= ${binary:Version}), + libindicator3-3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -73,7 +75,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-3 (= ${binary:Version}), + libindicator3-4 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -86,7 +88,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-3 (= ${binary:Version}) + libindicator3-4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator3-3.install b/debian/libindicator3-4.install index aaa2e72..aaa2e72 100644 --- a/debian/libindicator3-3.install +++ b/debian/libindicator3-4.install diff --git a/debian/libindicator3.install b/debian/libindicator4.install index 85dbd3e..85dbd3e 100644 --- a/debian/libindicator3.install +++ b/debian/libindicator4.install diff --git a/debian/rules b/debian/rules index 4c21f86..4581c33 100755 --- a/debian/rules +++ b/debian/rules @@ -9,31 +9,31 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)' +DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' -configure/libindicator3-3:: stamp-configure-gtk3 -stamp-configure-gtk3: - : # configure for GTK+ 3.0 +configure/libindicator4:: stamp-configure-gtk2 +stamp-configure-gtk2: + : # configure for GTK+ 2.0 set -e; \ - rm -rf build-gtk3; \ - mkdir build-gtk3; \ - cd build-gtk3; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + rm -rf build-gtk2; \ + mkdir build-gtk2; \ + cd build-gtk2; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ cd ..; - touch stamp-configure-gtk3 + touch stamp-configure-gtk2 -build/libindicator3-3:: stamp-build-gtk3 -stamp-build-gtk3: stamp-configure-gtk3 - : # build for GTK+ 3.0 - $(MAKE) -C build-gtk3; - touch stamp-build-gtk3 +build/libindicator4:: stamp-build-gtk2 +stamp-build-gtk2: stamp-configure-gtk2 + : # build for GTK+ 2.0 + $(MAKE) -C build-gtk2; + touch stamp-build-gtk2 -common-install-prehook-arch:: stamp-build-gtk3 - : # install for GTK+ 3.0 - $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install +common-install-prehook-arch:: stamp-build-gtk2 + : # install for GTK+ 2.0 + $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install clean:: - rm -f stamp-*-gtk3 - rm -rf build-gtk3 + rm -f stamp-*-gtk2 + rm -rf build-gtk2 |