On Tue, Jun 2, 2009 at 14:54:58 +0200, Julien Cristau wrote:
> On Tue, May 26, 2009 at 20:30:37 +0200, Iustin Pop wrote:
>
> > Thanks for the report. I'm currently on a trip and thus won't be able to
> > work
> > on this for about a week or so. If this is blocks other packages (and the
> > release hint is not enough), a NMU would be very welcome.
> >
> Hi Iustin,
>
> I'll NMU with the attached patch in a moment.
>
So it turns out I'm a moron and didn't test it properly. Incremental
patch attached, will upload -2.2 in a bit.
Cheers,
Julien
diff -u protobuf-2.0.3/debian/changelog protobuf-2.0.3/debian/changelog
--- protobuf-2.0.3/debian/changelog
+++ protobuf-2.0.3/debian/changelog
@@ -1,3 +1,14 @@
+protobuf (2.0.3-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS from -2.1: don't fail when we can't clean up the java build,
+ such as when openjdk isn't installed.
+ * Disable parallel builds, because libtool is made of fail (if binary-arch
+ and build-indep run concurrently, we relink a library while it's being
+ used; that doesn't work so well).
+
+ -- Julien Cristau <jcris...@debian.org> Tue, 02 Jun 2009 16:19:00 +0200
+
protobuf (2.0.3-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u protobuf-2.0.3/debian/rules protobuf-2.0.3/debian/rules
--- protobuf-2.0.3/debian/rules
+++ protobuf-2.0.3/debian/rules
@@ -25,10 +25,10 @@
else
CFLAGS += -O2
endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
+#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+# MAKEFLAGS += -j$(NUMJOBS)
+#endif
# end DEB_BUILD_OPTIONS
version=0.0.0
@@ -93,7 +93,7 @@
rm -rf protobuf.egg-info
# remove java builds
- $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean
+ $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true
dh_clean
