diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/fix-null-string-to-variant-crash.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
5 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d215213..89cc5e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-application (0.2.94-0ubuntu2) natty; urgency=low + + * debian/control, debian/rules: + - Add quilt as a patch system + * debian/patches/fix-null-string-to-variant-crash.patch: + - Don't pass a null string to GVariant, it hates it. LP: #724767 + + -- Michael Terry <mterry@ubuntu.com> Fri, 25 Feb 2011 08:53:58 -0500 + indicator-application (0.2.94-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index b806b99..a1f6be0 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), + quilt, libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, diff --git a/debian/patches/fix-null-string-to-variant-crash.patch b/debian/patches/fix-null-string-to-variant-crash.patch new file mode 100644 index 0000000..ebcad4c --- /dev/null +++ b/debian/patches/fix-null-string-to-variant-crash.patch @@ -0,0 +1,19 @@ +=== modified file 'src/application-service-appstore.c' +Index: indicator-application.ubu/src/application-service-appstore.c +=================================================================== +--- indicator-application.ubu.orig/src/application-service-appstore.c 2011-02-25 08:50:32.170749000 -0500 ++++ indicator-application.ubu/src/application-service-appstore.c 2011-02-25 08:53:26.313552982 -0500 +@@ -1238,9 +1238,10 @@ + } + + g_variant_builder_add (&builder, "(sisossss)", app->icon, +- position++, app->dbus_name, app->menu, +- app->icon_theme_path, app->label, +- app->guide, app->icon_desc); ++ position++, app->dbus_name, app->menu, ++ app->icon_theme_path, app->label, ++ app->guide, ++ (app->icon_desc != NULL) ? app->icon_desc : ""); + } + + out = g_variant_builder_end(&builder); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8d2cb6b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-null-string-to-variant-crash.patch diff --git a/debian/rules b/debian/rules index dd456c1..7a7c9e8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed |