diff options
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | debian/changelog | 18 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/libindicate-dev.install | 1 | ||||
-rw-r--r-- | debian/libindicate0.install | 1 | ||||
-rw-r--r-- | libindicate/Makefile.am | 52 |
6 files changed, 51 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 45a2bdb..f304ab6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,4 +15,5 @@ EXTRA_DIST = \ xmldocs.make DISTCLEANFILES = \ - indicator-applet-*.tar.gz + indicator-applet-*.tar.gz \ + gtk-doc.make diff --git a/debian/changelog b/debian/changelog index a9fce89..56ba0b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +indicator-applet (0.1.1-0ubuntu3~ppa2) jaunty; urgency=low + + * Putting GIR into the install files. + + -- Ted Gould <ted@ubuntu.com> Wed, 25 Feb 2009 14:35:59 -0600 + +indicator-applet (0.1.1-0ubuntu3~ppa1) jaunty; urgency=low + + * Turning on GIR + + -- Ted Gould <ted@ubuntu.com> Wed, 25 Feb 2009 11:16:12 -0600 + +indicator-applet (0.1-0ubuntu3~ppa1) intrepid; urgency=low + + * Pulling in and testing icon changes. + + -- Ted Gould <ted@ubuntu.com> Wed, 18 Feb 2009 14:05:14 -0600 + indicator-applet (0.1.1-0ubuntu2) UNRELEASED; urgency=low * src/applet-main.c, applet_fill_cb(): Do not show anything if we diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install index 4623919..f65d387 100644 --- a/debian/libindicate-dev.install +++ b/debian/libindicate-dev.install @@ -2,3 +2,4 @@ debian/tmp/usr/include/ debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/libindicate.a debian/tmp/usr/lib/libindicate.so +debian/tmp/usr/share/gir/ diff --git a/debian/libindicate0.install b/debian/libindicate0.install index 0618a58..9369053 100644 --- a/debian/libindicate0.install +++ b/debian/libindicate0.install @@ -1 +1,2 @@ debian/tmp/usr/lib/libindicate.so.* +debian/tmp/usr/lib/girepository/ diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 707d297..fdbda8a 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -76,28 +76,32 @@ listener-marshal.c: $(srcdir)/listener-marshal.list pkgconfig_DATA = indicate.pc pkgconfigdir = $(libdir)/pkgconfig -#gobjectintrospection_gir_DATA = \ -# Indicate-0.1.gir -#gobjectintrospection_girdir = $(datadir)/gir -# -#gobjectintrospection_type_DATA = \ -# Indicate-0.1.typelib -#gobjectintrospection_typedir = $(libdir)/girepository -# -#irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers)) -#Indicate-0.1.gir: $(irscanner_headers) -# $(G_IR_SCANNER) \ -# -v --namespace Indicate \ -# --nsversion=0.1 \ -# --add-include-path=$(srcdir) \ -# --include=GObject-2.0 \ -# --include=GLib-2.0 \ -# --include=GdkPixbuf-2.0 \ -# --library=indicate --pkg indicate \ -# --output Indicate-0.1.gir $(irscanner_headers) -# -#Indicate-0.1.typelib: Indicate-0.1.gir -# $(G_IR_COMPILER) \ -# --includedir=$(srcdir) Indicate-0.1.gir \ -# -o Indicate-0.1.typelib +gobjectintrospection_gir_DATA = \ + Indicate-0.1.gir +gobjectintrospection_girdir = $(datadir)/gir + +gobjectintrospection_type_DATA = \ + Indicate-0.1.typelib +gobjectintrospection_typedir = $(libdir)/girepository + +irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers)) +Indicate-0.1.gir: $(irscanner_headers) + $(G_IR_SCANNER) \ + -v --namespace Indicate \ + --nsversion=0.1 \ + --add-include-path=$(srcdir) \ + --include=GObject-2.0 \ + --include=GLib-2.0 \ + --include=GdkPixbuf-2.0 \ + --library=indicate --pkg indicate \ + --output Indicate-0.1.gir $(irscanner_headers) + +Indicate-0.1.typelib: Indicate-0.1.gir + $(G_IR_COMPILER) \ + --includedir=$(srcdir) Indicate-0.1.gir \ + -o Indicate-0.1.typelib + +DISTCLEANFILES = \ + Indicate-0.1.gir \ + Indicate-0.1.typelib |