Hi,

As tulip has FTBFS on all buildds for over 220 days, and the remaining
arch is not installable either, I'm about to upload a NMU fixing the
build, which includes also fixes for the FTBFS with GCC 4.7 (#667401),
as well as updating the libpng-dev build-dependency (#662526).

Please find the diff to -2.1 attached.

Thanks,
Regis
diff -Nru tulip-3.6.0dfsg/debian/changelog tulip-3.6.0dfsg/debian/changelog
--- tulip-3.6.0dfsg/debian/changelog	2011-09-09 22:58:34.000000000 +0200
+++ tulip-3.6.0dfsg/debian/changelog	2012-04-23 22:52:44.000000000 +0200
@@ -1,3 +1,13 @@
+tulip (3.6.0dfsg-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix debian/rules, so the package compiles on the buildds. Closes: #650653.
+  * Add gcc4.7_ftbfs patch to fix FTBFS with GCC 4.7. Closes: #667401.
+  * Update Build-Depends on libpng-dev. Closes: #662526.
+  * Bump debhelper Build-Depends to >= 9, as recommended by lintian.
+
+ -- Regis Boudin <re...@debian.org>  Mon, 23 Apr 2012 22:52:11 +0200
+
 tulip (3.6.0dfsg-2) unstable; urgency=low
 
   * Don't build docs for tulip-doc from build-arch, move java packages,
diff -Nru tulip-3.6.0dfsg/debian/control tulip-3.6.0dfsg/debian/control
--- tulip-3.6.0dfsg/debian/control	2011-09-05 22:43:32.000000000 +0200
+++ tulip-3.6.0dfsg/debian/control	2012-04-23 22:53:57.000000000 +0200
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Yann Dirson <dir...@debian.org>
-Build-Depends: debhelper (>> 8), cmake, libqt4-dev, qt4-dev-tools, freeglut3-dev, docbook-to-man, libgl1-mesa-dev | libgl-dev, dh-buildinfo, libfreetype6-dev, libxml2-dev, libgle3-dev, libxml2-utils, graphviz, libjpeg-dev, libpng12-dev, libftgl-dev, libglew1.5-dev, libqt4-opengl-dev
+Build-Depends: debhelper (>= 9), cmake, libqt4-dev, qt4-dev-tools, freeglut3-dev, docbook-to-man, libgl1-mesa-dev | libgl-dev, dh-buildinfo, libfreetype6-dev, libxml2-dev, libgle3-dev, libxml2-utils, graphviz, libjpeg-dev, libpng-dev, libftgl-dev, libglew1.5-dev, libqt4-opengl-dev
 Build-Depends-Indep: default-jre-headless, libsaxon-java, libxml-commons-resolver1.1-java, docbook-xsl, doxygen
 Homepage: http://tulip-software.org/
 Standards-Version: 3.9.1
diff -Nru tulip-3.6.0dfsg/debian/patches/gcc4.7_ftbfs tulip-3.6.0dfsg/debian/patches/gcc4.7_ftbfs
--- tulip-3.6.0dfsg/debian/patches/gcc4.7_ftbfs	1970-01-01 01:00:00.000000000 +0100
+++ tulip-3.6.0dfsg/debian/patches/gcc4.7_ftbfs	2012-04-23 21:27:50.000000000 +0200
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with GCC 4.7
+ Add a missing include in the headers.
+Author: Regis Boudin <re...@debian.org>
+
+--- tulip-3.6.0dfsg.orig/library/tulip/include/tulip/SimpleVector.h
++++ tulip-3.6.0dfsg/library/tulip/include/tulip/SimpleVector.h
+@@ -21,6 +21,8 @@
+ #ifndef _SIMPLE_VECTOR_H_
+ #define _SIMPLE_VECTOR_H_
+ 
++#include <cstdlib>
++
+ namespace tlp {
+ 
+ // SimpleVector
diff -Nru tulip-3.6.0dfsg/debian/patches/series tulip-3.6.0dfsg/debian/patches/series
--- tulip-3.6.0dfsg/debian/patches/series	2011-09-09 22:57:53.000000000 +0200
+++ tulip-3.6.0dfsg/debian/patches/series	2012-04-23 21:26:37.000000000 +0200
@@ -6,3 +6,4 @@
 0006-Use-system-FTGL-not-the-one-shipped-in-thirtparty.patch
 0007-Disable-python-binding.patch
 0008-Use-Debian-packaged-jars.patch
+gcc4.7_ftbfs
diff -Nru tulip-3.6.0dfsg/debian/rules tulip-3.6.0dfsg/debian/rules
--- tulip-3.6.0dfsg/debian/rules	2011-09-09 23:08:06.000000000 +0200
+++ tulip-3.6.0dfsg/debian/rules	2012-04-23 19:32:20.000000000 +0200
@@ -7,26 +7,23 @@
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_SKIP_RPATH:BOOL=YES
 
-build-arch:
-	dh $@ --parallel
+override_dh_auto_build-arch:
+	dh_auto_build -a --parallel
 	docbook-to-man debian/tulip.sgml > debian/tulip.1
-build-indep:
-	#dh $@
+override_dh_auto_build-indep:
+	dh_auto_build -i
 	$(MAKE) -C obj-* doc
 
-install-indep: build-indep
-	dh_prep -i
+override_dh_auto_install-indep:
+	dh_auto_install -i -- -C docs
 	mkdir -p debian/tmp/usr/share/doc/tulip-doc
 	set -e; for d in common userHandbook developerHandbook doxygen; do \
 		cp -a obj-*/docs/$$d debian/tmp/usr/share/doc/tulip-doc/ ;\
 	done
-	dh_auto_install -- -C docs
-	dh $@
 
-install-arch: build-arch
-	dh_prep -a
+override_dh_auto_install-arch: 
+	dh_auto_install -a
 	install -D debian/tulip.1 debian/tmp/usr/share/man/man1/tulip.1
-	dh $@
 
 override_dh_install:
 	dh_install --fail-missing
@@ -36,4 +33,3 @@
 	rm -f debian/tulip.1
 	rm -rf docs/doxygen/xml
 
-binary: binary-arch binary-indep ;

Reply via email to