diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-05 16:17:00 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-05 16:17:00 -0500 |
| commit | 10231dc35151f39cc8f8c22430d8d63ced483ff7 (patch) | |
| tree | 0bb6a9dc922498a5f9332eb78b721cf4b9a6295b | |
| parent | a527d5d60c0d8593a1574cf86ef603a8c02871d4 (diff) | |
| parent | cce935cb4b020a2634129f1fe5cd8175c6214fa8 (diff) | |
| download | libdbusmenu-10231dc35151f39cc8f8c22430d8d63ced483ff7.tar.gz libdbusmenu-10231dc35151f39cc8f8c22430d8d63ced483ff7.tar.bz2 libdbusmenu-10231dc35151f39cc8f8c22430d8d63ced483ff7.zip | |
* Upstream Merge
* Fix GIR scan to not include duplicate namespaces (LP: #750575)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 35a3d21..72869e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.4.1-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Fix GIR scan to not include duplicate namespaces (LP: #750575) + + -- Ted Gould <ted@ubuntu.com> Tue, 05 Apr 2011 16:16:09 -0500 + libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 50a8f2c..aa36445 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -103,7 +103,6 @@ DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER) -DbusmenuGtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) DbusmenuGtk_0_4_gir_EXPORT_PACKAGES = dbusmenu-gtk$(VER)-0.4 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above @@ -112,7 +111,6 @@ DbusmenuGtk3_0_4_gir_CFLAGS = $(DbusmenuGtk_0_4_gir_CFLAGS) DbusmenuGtk3_0_4_gir_LIBS = $(DbusmenuGtk_0_4_gir_LIBS) DbusmenuGtk3_0_4_gir_FILES = $(DbusmenuGtk_0_4_gir_FILES) DbusmenuGtk3_0_4_gir_NAMESPACE = $(DbusmenuGtk_0_4_gir_NAMESPACE) -DbusmenuGtk3_0_4_gir_SCANNERFLAGS = $(DbusmenuGtk_0_4_gir_SCANNERFLAGS) DbusmenuGtk3_0_4_gir_EXPORT_PACKAGES = $(DbusmenuGtk_0_4_gir_EXPORT_PACKAGES) INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.4.gir |