diff options
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 41 | ||||
| -rw-r--r-- | debian/libindicator-tools.install | 2 | ||||
| -rw-r--r-- | debian/libindicator3-1.install | 1 | ||||
| -rw-r--r-- | debian/libindicator3-dev.install | 3 | ||||
| -rw-r--r-- | debian/libindicator3-tools.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 31 | ||||
| -rw-r--r-- | libindicator/Makefile.am | 4 | ||||
| -rw-r--r-- | libindicator3-1.install | 1 | ||||
| -rw-r--r-- | tools/Makefile.am | 15 |
10 files changed, 105 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index aafd6ce..86b8a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,23 @@ -libindicator (0.3.15-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.15-0ubuntu1) UNRELEASED; urgency=low + + * debian/rules + - Added build targets to build with gtk3 enabled in additional to + default build with gtk2 + * debian/control + - Updated build depends to support building with gtk+-3.0 + - Added dh-autoreconf build depends + - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries + binaries + * libindicator/Makefile.am and tools/Makefile.am + - Fixes needed for building with-gtk=3 + [ Ted Gould ] * New upstream release. * Adding a small file to set debugging environment variables * Allowing to build for GTK 2/3 and build parallel libraries * debian/control: Adding package libindicator-debugenv - -- Ted Gould <ted@ubuntu.com> Thu, 11 Nov 2010 14:44:51 -0600 + -- Ken VanDine <ken.vandine@canonical.com> Wed, 24 Nov 2010 18:29:40 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 5f33619..a7e93cb 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,12 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), + libgtk3.0-dev (>= 2.91.3), libdbus-glib-1-dev, libtool, intltool, - gtk-doc-tools + gtk-doc-tools, + dh-autoreconf Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu @@ -54,7 +56,7 @@ Description: Tools for libindicator Package: libindicator-debugenv Section: devel -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicator1 (= ${binary:Version}) @@ -62,3 +64,38 @@ Description: Debug environment for libindicator Sets debug values useful for developers of applications using indicators. . This package contains session configuration files + +Package: libindicator3-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains the library itself. + +Package: libindicator3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk3.0-dev (>= 2.91.3), + libindicator3-1 (= ${binary:Version}) +Description: panel indicator applet - library development files + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. + +Package: libindicator3-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicator3-1 (= ${binary:Version}) +Description: Tools for libindicator + Tools useful for developers of applications using indicators. + . + This package contains files that are needed to build applications. diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index e9565f0..07cd88f 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1 +1 @@ -debian/tmp/usr/lib/libindicator/* +debian/tmp/usr/lib/libindicator/indicator-loader diff --git a/debian/libindicator3-1.install b/debian/libindicator3-1.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install new file mode 100644 index 0000000..2ac38b7 --- /dev/null +++ b/debian/libindicator3-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/pkgconfig/indicator3.pc +debian/tmp/usr/lib/libindicator3.a +debian/tmp/usr/lib/libindicator3.so diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install new file mode 100644 index 0000000..2766bc0 --- /dev/null +++ b/debian/libindicator3-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator/indicator-loader3 diff --git a/debian/rules b/debian/rules index 7ad558a..e4f4f04 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,38 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk +DEB_SRCDIR = . +DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' +DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)' +configure/libindicator3-1:: stamp-configure-gtk3 +stamp-configure-gtk3: + : # configure for GTK+ 3.0 + set -e; \ + rm -rf build-gtk3; \ + mkdir build-gtk3; \ + cd build-gtk3; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ + cd ..; + touch stamp-configure-gtk3 + +build/libindicator3-1:: stamp-build-gtk3 +stamp-build-gtk3: stamp-configure-gtk3 + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3; + touch stamp-build-gtk3 + +common-install-prehook-arch:: stamp-build-gtk3 + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install + +clean:: + rm -f stamp-*-gtk3 + rm -rf build-gtk3 diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 39cb2b7..b6239e6 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -73,7 +73,7 @@ glib_marshal_prefix = _indicator_object_marshal indicator-object-enum-types.h: s-enum-types-h @true s-enum-types-h: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) @@ -81,7 +81,7 @@ s-enum-types-h: $(indicator_headers) indicator-object-enum-types.c: s-enum-types-c @true s-enum-types-c: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ && rm -f tmp-indicator-object-enum-types.c diff --git a/libindicator3-1.install b/libindicator3-1.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/libindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c67491..9861ac1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,11 +1,13 @@ if USE_GTK3 INDICATOR_LIB = -lindicator3 +libexec_PROGRAMS = indicator-loader3 +VER=3 else +VER= INDICATOR_LIB = -lindicator +libexec_PROGRAMS = indicator-loader endif -libexec_PROGRAMS = \ - indicator-loader ############################# # Indicator Loader @@ -17,6 +19,7 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ @@ -24,6 +27,14 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ $(INDICATOR_LIB) +# We duplicate these here because Automake won't let us use $(VER) on the left hand side. +# Since we carefully use $(VER) in the right hand side above, we can assign the same values. +# Only one version of the library is every compiled at the same time, so it is safe to reuse +# the right hand sides like this. +indicator_loader3_SOURCES = $(indicator_loader_SOURCES) +indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) +indicator_loader3_LDADD = $(indicator_loader_LDADD) + xsessiondir = $(sysconfdir)/X11/Xsession.d xsession_DATA = 80indicator-debugging |