diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-04 09:24:32 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-04 09:24:32 -0600 |
| commit | c036a628254ebe4e5c127e5cd159fd08e8bb2c88 (patch) | |
| tree | bf0c407fa82db9203251bf24a5bbb8ea7a29b431 | |
| parent | 67defb98d6102ca66f3e0f8839a992aae2562c32 (diff) | |
| parent | f753b6b03be3585bb9f96b276afffa0164a9a9e3 (diff) | |
| download | libdbusmenu-c036a628254ebe4e5c127e5cd159fd08e8bb2c88.tar.gz libdbusmenu-c036a628254ebe4e5c127e5cd159fd08e8bb2c88.tar.bz2 libdbusmenu-c036a628254ebe4e5c127e5cd159fd08e8bb2c88.zip | |
* Upstream Merge
* Fix the enum-types.h header in the dist
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/enum-types.c.in | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/enum-types.h.in | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 6ae49f3..610cf88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.100-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Fix the enum-types.h header in the dist + + -- Ted Gould <ted@ubuntu.com> Fri, 04 Mar 2011 09:24:01 -0600 + libdbusmenu (0.3.100-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/libdbusmenu-glib/enum-types.c.in b/libdbusmenu-glib/enum-types.c.in index 9395f5f..40f1759 100644 --- a/libdbusmenu-glib/enum-types.c.in +++ b/libdbusmenu-glib/enum-types.c.in @@ -31,7 +31,7 @@ License version 3 and version 2.1 along with this program. If not, see /*** END file-header ***/ /*** BEGIN file-production ***/ -#include "@filename@" +#include "@basename@" /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/libdbusmenu-glib/enum-types.h.in b/libdbusmenu-glib/enum-types.h.in index 488b615..5758438 100644 --- a/libdbusmenu-glib/enum-types.h.in +++ b/libdbusmenu-glib/enum-types.h.in @@ -44,13 +44,16 @@ G_END_DECLS /*** BEGIN file-production ***/ /* Enumerations from file: "@filename@" */ -#include "@filename@" +#include "@basename@" + /*** END file-production ***/ /*** BEGIN value-header ***/ + GType @enum_name@_get_type (void) G_GNUC_CONST; const gchar * @enum_name@_get_nick (@EnumName@ value) G_GNUC_CONST; @EnumName@ @enum_name@_get_value_from_nick (const gchar * nick) G_GNUC_CONST; + /** DBUSMENU_TYPE_@ENUMSHORT@: |