ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/libindicate/pc-migration into lp:libindicate with lp:~ted/libindicate/gdbus-port-away as a prerequisite.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/libindicate/pc-migration/+merge/46213

Changing all the files.
-- 
https://code.launchpad.net/~ted/libindicate/pc-migration/+merge/46213
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== modified file 'configure.ac'
--- configure.ac	2011-01-13 23:45:01 +0000
+++ configure.ac	2011-01-13 23:45:01 +0000
@@ -232,9 +232,9 @@
 AC_OUTPUT([
 Makefile
 libindicate/Makefile
-libindicate/indicate.pc
+libindicate/indicate-0.5.pc
 libindicate-gtk/Makefile
-libindicate-gtk/indicate-gtk.pc
+libindicate-gtk/indicate-gtk-0.5.pc
 examples/Makefile
 examples/indicator-mono-example
 tests/Makefile

=== modified file 'libindicate-gtk/Makefile.am'
--- libindicate-gtk/Makefile.am	2011-01-13 23:45:01 +0000
+++ libindicate-gtk/Makefile.am	2011-01-13 23:45:01 +0000
@@ -3,7 +3,7 @@
 	-DG_LOG_DOMAIN=\"libindicate-gtk\"
 
 EXTRA_DIST = \
-	indicate-gtk.pc.in
+	indicate-gtk-0.5.pc.in
 
 lib_LTLIBRARIES = \
 	libindicate-gtk.la
@@ -36,7 +36,7 @@
 	../libindicate/libindicate.la \
 	$(LIBINDICATEGTK_LIBS)
 
-pkgconfig_DATA = indicate-gtk.pc
+pkgconfig_DATA = indicate-gtk-0.5.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 CLEANFILES = 
@@ -60,19 +60,19 @@
 introspection_sources = \
         $(addprefix $(srcdir)/,$(indicate_gtk_headers))
 
-Indicate-Gtk-0.4.gir: libindicate-gtk.la
-Indicate_Gtk_0_4_gir_INCLUDES = \
+Indicate-Gtk-0.5.gir: libindicate-gtk.la
+Indicate_Gtk_0_5_gir_INCLUDES = \
 	GObject-2.0 \
 	Gtk-2.0 \
 	GLib-2.0 \
 	GdkPixbuf-2.0 \
-	Indicate-0.4
-Indicate_Gtk_0_4_gir_CFLAGS = $(LIBINDICATEGTK_CFLAGS) -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/libindicate
-Indicate_Gtk_0_4_gir_LIBS = libindicate-gtk.la
-Indicate_Gtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
-Indicate_Gtk_0_4_gir_FILES = $(introspection_sources)
+	Indicate-0.5
+Indicate_Gtk_0_5_gir_CFLAGS = $(LIBINDICATEGTK_CFLAGS) -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/libindicate
+Indicate_Gtk_0_5_gir_LIBS = libindicate-gtk.la
+Indicate_Gtk_0_5_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
+Indicate_Gtk_0_5_gir_FILES = $(introspection_sources)
 
-INTROSPECTION_GIRS += Indicate-Gtk-0.4.gir
+INTROSPECTION_GIRS += Indicate-Gtk-0.5.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -92,23 +92,23 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = Indicate-Gtk-0.4.vapi
+vapi_DATA = Indicate-Gtk-0.5.vapi
 
-Indicate-Gtk-0.4.vapi: Indicate-Gtk-0.4.tmp.gir Makefile.am
-	$(VALA_API_GEN) --library=Indicate-Gtk-0.4 \
+Indicate-Gtk-0.5.vapi: Indicate-Gtk-0.5.tmp.gir Makefile.am
+	$(VALA_API_GEN) --library=Indicate-Gtk-0.5 \
 		--pkg gtk+-2.0 \
 		--pkg Dbusmenu-Glib-0.4 \
-		--pkg Indicate-0.4 \
+		--pkg Indicate-0.5 \
 		--vapidir=$(top_builddir)/libindicate \
 		$<
 
-Indicate-Gtk-0.4.tmp.gir: Indicate-Gtk-0.4.gir
+Indicate-Gtk-0.5.tmp.gir: Indicate-Gtk-0.5.gir
 	$(SED) \
 		-e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \
 		-e "s|Atk.ImplementorIface|Atk.Implementor|g" \
 		$< > $@
 
-CLEANFILES += $(vapi_DATA) Indicate-Gtk-0.4.tmp.gir
+CLEANFILES += $(vapi_DATA) Indicate-Gtk-0.5.tmp.gir
 
 endif
 

=== renamed file 'libindicate-gtk/indicate-gtk.pc.in' => 'libindicate-gtk/indicate-gtk-0.5.pc.in'
=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2011-01-13 23:45:01 +0000
+++ libindicate/Makefile.am	2011-01-13 23:45:01 +0000
@@ -31,7 +31,7 @@
 
 EXTRA_DIST += \
 	$(DBUS_SPECS) \
-	indicate.pc.in
+	indicate-0.5.pc.in
 
 lib_LTLIBRARIES = \
 	libindicate.la
@@ -100,7 +100,7 @@
 	gen-indicate-listener.xml.h \
 	gen-indicate-listener.xml.c
 
-pkgconfig_DATA = indicate.pc
+pkgconfig_DATA = indicate-0.5.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 CLEANFILES += \
@@ -125,16 +125,16 @@
 
 introspection_sources = $(indicate_headers)
 
-Indicate-0.4.gir: libindicate.la
-Indicate_0_4_gir_INCLUDES = \
+Indicate-0.5.gir: libindicate.la
+Indicate_0_5_gir_INCLUDES = \
         GObject-2.0 \
         GLib-2.0 \
         Dbusmenu-Glib-0.4
-Indicate_0_4_gir_CFLAGS = $(LIBINDICATE_CFLAGS) -I$(srcdir)
-Indicate_0_4_gir_LIBS = libindicate.la
-Indicate_0_4_gir_FILES = $(introspection_sources)
+Indicate_0_5_gir_CFLAGS = $(LIBINDICATE_CFLAGS) -I$(srcdir)
+Indicate_0_5_gir_LIBS = libindicate.la
+Indicate_0_5_gir_FILES = $(introspection_sources)
 
-INTROSPECTION_GIRS += Indicate-0.4.gir
+INTROSPECTION_GIRS += Indicate-0.5.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -153,10 +153,10 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = Indicate-0.4.vapi
+vapi_DATA = Indicate-0.5.vapi
 
-Indicate-0.4.vapi: Indicate-0.4.gir Makefile.am
-	$(VALA_API_GEN) --library=Indicate-0.4 \
+Indicate-0.5.vapi: Indicate-0.5.gir Makefile.am
+	$(VALA_API_GEN) --library=Indicate-0.5 \
 		--pkg glib-2.0 \
 		--pkg Dbusmenu-Glib-0.4 \
 		--vapidir=$(top_builddir)/src \

=== renamed file 'libindicate/indicate.pc.in' => 'libindicate/indicate-0.5.pc.in'