Package: cln
Version: 1.3.1-1
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
Hi Richard,
The cln package fails to build with g++ 4.4, because the cstdio header
needed by various source files is now no longer being included
behind-the-scenes and needs to be included explicitly. The package has been
patched in Ubuntu to address this; please find the patch attached.
Here's the accompanying changelog entry for the change:
* Add build-dependency on quilt.
* debian/patches/eof_decl.patch: include cstdio when we need EOF, instead
of expecting it to be defined for us.
* Fix bogus clean rule that nuked my debian/patches directory right after
I created it.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[email protected] [email protected]
diff -u cln-1.3.1/debian/control cln-1.3.1/debian/control
--- cln-1.3.1/debian/control
+++ cln-1.3.1/debian/control
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Richard Kreckel <[email protected]>
-Build-Depends: debhelper, libgmp3-dev, texinfo
+Build-Depends: debhelper, libgmp3-dev, texinfo, quilt (>= 0.40)
Standards-Version: 3.8.3
Homepage: http://www.ginac.de/CLN/
diff -u cln-1.3.1/debian/rules cln-1.3.1/debian/rules
--- cln-1.3.1/debian/rules
+++ cln-1.3.1/debian/rules
@@ -1,11 +1,13 @@
#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
+
package=cln
version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
-build:
+build: patch
dh_testdir
./configure --prefix=/usr `dpkg-architecture -qDEB_HOST_GNU_TYPE`
# * ARM: CLN's assembler support is not working properly (it was only
@@ -25,15 +27,12 @@
(cd doc; ${MAKE} cln.html)
touch build
-clean:
+clean: unpatch
dh_testdir
dh_clean
-rm -f build
[ ! -f Makefile ] || ${MAKE} distclean
-rm -f `find . -name "*~"`
- -rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
- -rm -rf debian/.libs debian/*.o
- -rm -f debian/*substvars
binary-indep: build
dh_testdir
diff -u cln-1.3.1/debian/changelog cln-1.3.1/debian/changelog
only in patch2:
unchanged:
--- cln-1.3.1.orig/debian/patches/series
+++ cln-1.3.1/debian/patches/series
@@ -0,0 +1 @@
+eof_decl.patch
only in patch2:
unchanged:
--- cln-1.3.1.orig/debian/patches/eof_decl.patch
+++ cln-1.3.1/debian/patches/eof_decl.patch
@@ -0,0 +1,60 @@
+Index: cln/src/base/string/input/cl_st_get1.cc
+===================================================================
+--- cln.orig/src/base/string/input/cl_st_get1.cc
++++ cln/src/base/string/input/cl_st_get1.cc
+@@ -9,6 +9,7 @@
+
+ // Implementation.
+
++#include <cstdio>
+ #include "cln/io.h"
+ #include "base/string/cl_spushstring.h"
+
+Index: cln/src/base/string/input/cl_st_get2.cc
+===================================================================
+--- cln.orig/src/base/string/input/cl_st_get2.cc
++++ cln/src/base/string/input/cl_st_get2.cc
+@@ -9,6 +9,7 @@
+
+ // Implementation.
+
++#include <cstdio>
+ #include "cln/io.h"
+ #include "base/string/cl_spushstring.h"
+
+Index: cln/src/base/string/input/cl_st_getline1.cc
+===================================================================
+--- cln.orig/src/base/string/input/cl_st_getline1.cc
++++ cln/src/base/string/input/cl_st_getline1.cc
+@@ -9,6 +9,7 @@
+
+ // Implementation.
+
++#include <cstdio>
+ #include "cln/io.h"
+ #include "base/string/cl_spushstring.h"
+
+Index: cln/src/base/string/input/cl_st_getline2.cc
+===================================================================
+--- cln.orig/src/base/string/input/cl_st_getline2.cc
++++ cln/src/base/string/input/cl_st_getline2.cc
+@@ -9,6 +9,7 @@
+
+ // Implementation.
+
++#include <cstdio>
+ #include "cln/io.h"
+ #include "base/string/cl_spushstring.h"
+
+Index: cln/src/base/string/input/cl_st_gettoken.cc
+===================================================================
+--- cln.orig/src/base/string/input/cl_st_gettoken.cc
++++ cln/src/base/string/input/cl_st_gettoken.cc
+@@ -12,6 +12,7 @@
+ #include "cln/io.h"
+ #include "base/string/cl_spushstring.h"
+ #include <cctype>
++#include <cstdio>
+
+ namespace cln {
+
