On Mon, 13 May 2013 10:49:46 +0200, Emilio Pozuelo Monfort wrote: > >The ftbfs bugs caused by vala and a new gobject-introspection can easily be > >fixed (at least in most cases) by switching to valac-0.20 which just got its > >way > >into unstable. I just fixed bug #707378 this way by switching the build > >dependency accordingly. > > BTW it's preferred to switch to 'valac (>= 0.20)' instead of > 'valac-0.20' if possible so that we can seamlessly switch the vala > interpreter in the future.
I'm afraid that's not enough in this case, or at least there's yet
another problem:
gtk-doc: Building HTML
rm -rf /tmp/buildd/libindicate-0.6.92/./docs/reference/html
mkdir /tmp/buildd/libindicate-0.6.92/./docs/reference/html
mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "sgml.stamp
/tmp/buildd/libindicate-0.6.92/./docs/reference/libindicate-docs.sgml
version.xml" = "0"; then \
mkhtml_options=--path="/tmp/buildd/libindicate-0.6.92/./docs/reference"; \
fi
cd /tmp/buildd/libindicate-0.6.92/./docs/reference/html && gtkdoc-mkhtml
libindicate ../libindicate-docs.sgml
warning: failed to load external entity "../xml/indicator-message.xml"
../libindicate-docs.sgml:18: element include: XInclude error : could not load
../xml/indicator-message.xml, and no fallback was found
make[4]: *** [html-build.stamp] Error 6
make[4]: Leaving directory
`/tmp/buildd/libindicate-0.6.92/build/gtk2/docs/reference'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/tmp/buildd/libindicate-0.6.92/build/gtk2/docs'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/buildd/libindicate-0.6.92/build/gtk2'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/buildd/libindicate-0.6.92/build/gtk2'
make: *** [debian/stamp-makefile-build/gtk2] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
debdiff and full log attached.
Cheers,
gregor
--
.''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/
`. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
`- NP: U2: Where The Streets Have No Name
diff -u libindicate-0.6.92/debian/control libindicate-0.6.92/debian/control
--- libindicate-0.6.92/debian/control
+++ libindicate-0.6.92/debian/control
@@ -22,7 +22,7 @@
python-all-dev (>= 2.6.6-3~),
python-gtk2-dev,
dh-autoreconf,
- valac-0.16,
+ valac (>= 0.20),
Build-Depends-Indep: cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.3),
mono-gmcs,
diff -u libindicate-0.6.92/debian/changelog libindicate-0.6.92/debian/changelog
--- libindicate-0.6.92/debian/changelog
+++ libindicate-0.6.92/debian/changelog
@@ -1,3 +1,17 @@
+libindicate (0.6.92-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "Including individual glib headers no longer supported":
+ add patch glib-single-include.patch from Michael Biebl.
+ (Closes: #665571)
+ * Fix "FTBFS: Indicate-0.7.gir:137.11-137.38: error: expected start
+ element of `parameter'":
+ build-depend on valac (>= 0.20)
+ (Closes: #707412)
+ This also fixes "Upcoming vala 0.16 removal". (Closes: #709696)
+
+ -- gregor herrmann <[email protected]> Sat, 30 Nov 2013 17:58:52 +0100
+
libindicate (0.6.92-1) unstable; urgency=low
* Import new upstream release from Ubuntu.
only in patch2:
unchanged:
--- libindicate-0.6.92.orig/debian/patches/glib-single-include.patch
+++ libindicate-0.6.92/debian/patches/glib-single-include.patch
@@ -0,0 +1,14 @@
+Index: libindicate-0.6.92/libindicate/indicator.c
+===================================================================
+--- libindicate-0.6.92.orig/libindicate/indicator.c 2012-03-21 21:37:56.000000000 +0100
++++ libindicate-0.6.92/libindicate/indicator.c 2012-12-16 06:25:15.787861782 +0100
+@@ -27,8 +27,7 @@
+ <http://www.gnu.org/licenses/>
+ */
+
+-#include "glib.h"
+-#include "glib/gmessages.h"
++#include <glib.h>
+ #include "indicator.h"
+ #include "server.h"
+
libindicate_0.6.92-1.1_amd64.build.gz
Description: Binary data
signature.asc
Description: Digital signature
