Ted Gould has proposed merging
lp:~indicator-applet-developers/indicator-applet/applet-packaging into
lp:~ubuntu-core-dev/indicator-applet/ubuntu.
Requested reviews:
Ubuntu Sponsors for main (ubuntu-main-sponsors): sponsoring
--
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet-packaging/+merge/4611
Your team Indicator Applet Developers is subscribed to branch
lp:~indicator-applet-developers/indicator-applet/applet-packaging.
=== modified file 'configure.ac'
--- configure.ac 2009-03-12 17:24:47 +0000
+++ configure.ac 2009-03-18 05:12:25 +0000
@@ -4,7 +4,7 @@
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.1.2)
+AM_INIT_AUTOMAKE(indicator-applet, 0.1.3)
AM_MAINTAINER_MODE
@@ -61,19 +61,29 @@
# GObject Introspection
###########################
-PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0 >= 0.6])
-
-G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-AC_SUBST(G_IR_SCANNER)
-G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-AC_SUBST(G_IR_COMPILER)
-G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-AC_SUBST(G_IR_GENERATE)
-
-GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-AC_SUBST(GIRDIR)
-TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-AC_SUBST(TYPELIBDIR)
+AC_ARG_ENABLE(gobject-introspection, AC_HELP_STRING([--enable-gobject-introspection], [enable building the gobject-introspection files]), [enable_gir=$enableval], [enable_gir=yes])
+
+if test "x$enable_gir" = "xyes"; then
+ PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0 >= 0.6], gir_ok=yes, gir_ok=no)
+
+ if test "x$gir_ok" = "xyes"; then
+ G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ AC_SUBST(G_IR_SCANNER)
+ G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ AC_SUBST(G_IR_COMPILER)
+ G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ AC_SUBST(G_IR_GENERATE)
+
+ GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+ AC_SUBST(GIRDIR)
+ TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ AC_SUBST(TYPELIBDIR)
+ fi
+else
+ gir_ok=no
+fi
+
+AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
###########################
# GTK Doc
@@ -116,5 +126,6 @@
Indicator Applet Configuration:
- Prefix: $prefix
+ Prefix: $prefix
+ GObject Introspection: $gir_ok
])
=== modified file 'debian/changelog'
--- debian/changelog 2009-03-17 09:55:22 +0000
+++ debian/changelog 2009-03-18 05:17:00 +0000
@@ -1,3 +1,12 @@
+indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low
+
+ * New upstream version 0.1.3, makes the GObject introspection
+ an optional build item.
+ * debian/control: Removing GObject introspection
+ * debian/*.install, remove all of GIR references
+
+ -- Ted Gould <[email protected]> Wed, 18 Mar 2009 00:12:30 -0500
+
indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low
* Add debian/watch.
=== modified file 'debian/control'
--- debian/control 2009-02-25 21:48:02 +0000
+++ debian/control 2009-03-17 16:03:51 +0000
@@ -9,11 +9,7 @@
libdbus-glib-1-dev,
gnome-doc-utils,
libtool,
- intltool,
- gobject-introspection (>= 0.6),
- gobject-introspection-glib-2.0 (>= 0.6),
- libgirepository-dev (>= 0.6),
- gobject-introspection-repository
+ intltool
Standards-Version: 3.8.0
Homepage: https://launchpad.net/indicator-applet
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu
=== modified file 'debian/libindicate-dev.install'
--- debian/libindicate-dev.install 2009-02-25 20:35:56 +0000
+++ debian/libindicate-dev.install 2009-03-17 18:39:45 +0000
@@ -2,4 +2,3 @@
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/lib/libindicate.a
debian/tmp/usr/lib/libindicate.so
-debian/tmp/usr/share/gir/
=== modified file 'debian/libindicate0.install'
--- debian/libindicate0.install 2009-02-25 20:37:49 +0000
+++ debian/libindicate0.install 2009-03-17 18:39:45 +0000
@@ -1,2 +1,1 @@
debian/tmp/usr/lib/libindicate.so.*
-debian/tmp/usr/lib/girepository/
=== modified file 'debian/rules'
--- debian/rules 2009-03-16 22:23:33 +0000
+++ debian/rules 2009-03-17 18:39:45 +0000
@@ -3,6 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)'
=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am 2009-03-12 17:21:22 +0000
+++ libindicate/Makefile.am 2009-03-17 16:00:01 +0000
@@ -95,6 +95,8 @@
pkgconfig_DATA = indicate.pc
pkgconfigdir = $(libdir)/pkgconfig
+if USE_GIR
+
gobjectintrospection_gir_DATA = \
Indicate-0.1.gir
gobjectintrospection_girdir = $(datadir)/gir
@@ -124,3 +126,4 @@
Indicate-0.1.gir \
Indicate-0.1.typelib
+endif
_______________________________________________
Mailing list: https://launchpad.net/~dx-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dx-team
More help : https://help.launchpad.net/ListHelp
