Package: cmix Version: 2.0.12-5 Severity: normal Tags: patch As part of a bug squashing party to fix g++ transition issues ( http://lists.debian.org/debian-devel-announce/2005/09/msg00004.html ), I have made a non-maintainer upload of cmix. The diff between -5 and -5.1 is attached.
Hamish
reverted: --- cmix-2.0.12/debian/dirs +++ cmix-2.0.12.orig/debian/dirs @@ -1,19 +0,0 @@ -usr/share/doc/cmix -usr/bin -usr/lib -usr/share -usr/share/cmix -usr/share/cmix/sys -usr/share/cmix/examples -usr/share/cmix/examples/ack -usr/share/cmix/examples/binsearch -usr/share/cmix/examples/cint -usr/share/cmix/examples/fft -usr/share/cmix/examples/matrix -usr/share/cmix/examples/pow -usr/share/cmix/examples/printf -usr/share/cmix/examples/turing -usr/include -usr/include/cmix -usr/man -usr/man/man1 reverted: --- cmix-2.0.12/debian/docs +++ cmix-2.0.12.orig/debian/docs @@ -1 +0,0 @@ -README diff -u cmix-2.0.12/debian/control cmix-2.0.12/debian/control --- cmix-2.0.12/debian/control +++ cmix-2.0.12/debian/control @@ -1,7 +1,7 @@ Source: cmix Section: devel Priority: optional -Build-Depends: debhelper, bison, flex +Build-Depends: debhelper (>= 4), bison, flex Maintainer: Peter Makholm <[EMAIL PROTECTED]> Standards-Version: 3.1.0 diff -u cmix-2.0.12/debian/rules cmix-2.0.12/debian/rules --- cmix-2.0.12/debian/rules +++ cmix-2.0.12/debian/rules @@ -6,6 +6,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DH_COMPAT=4 + export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -44,17 +46,17 @@ dh_clean -k dh_installdirs - # Add here commands to install the package into debian/tmp. - $(MAKE) install prefix=`pwd`/debian/tmp/usr + # Add here commands to install the package into debian/cmix. + $(MAKE) install prefix=`pwd`/debian/cmix/usr # Some of the documentation is placed in .../usr/share/cmix - mv debian/tmp/usr/share/cmix/examples debian/tmp/usr/share/doc/cmix/ + mv debian/cmix/usr/share/cmix/examples debian/cmix/usr/share/doc/cmix/ # Some of the documentation is not installed - cp doc/manual/manual.dvi debian/tmp/usr/share/doc/cmix + cp doc/manual/manual.dvi debian/cmix/usr/share/doc/cmix # Manuals are placed in /usr/man - mv debian/tmp/usr/man debian/tmp/usr/share/man + mv debian/cmix/usr/man debian/cmix/usr/share/man touch install-stamp diff -u cmix-2.0.12/debian/changelog cmix-2.0.12/debian/changelog --- cmix-2.0.12/debian/changelog +++ cmix-2.0.12/debian/changelog @@ -1,3 +1,15 @@ +cmix (2.0.12-5.1) unstable; urgency=low + + * BSP NMU + * Fix FTBFS with gcc-4.0: label at end of switch statement in + src/speclib/unparse.c (closes: #258580). + * Fix FTBFS on amd64: insufficient precision in src/analyzer/Nset.h + (closes: #285593) + * Switch to debhelper 4. + * Thanks to Andreas Jochens for the patches. + + -- Hamish Moffatt <[EMAIL PROTECTED]> Sat, 10 Sep 2005 11:16:02 +0000 + cmix (2.0.12-5) unstable; urgency=low * Added flex and bison to build-depencies (Closes: 235233) only in patch2: unchanged: --- cmix-2.0.12.orig/src/speclib/unparse.c +++ cmix-2.0.12/src/speclib/unparse.c @@ -647,7 +647,6 @@ printInner(&stmt->plain.expr,names,f); fprintf2(f," */\n"); break; - default: } } only in patch2: unchanged: --- cmix-2.0.12.orig/src/analyzer/Nset.h +++ cmix-2.0.12/src/analyzer/Nset.h @@ -26,9 +26,9 @@ public: inline Nsetiter() : I() {} inline operator bool() const { return I.valid() ; } - inline unsigned operator*() const + inline unsigned long operator*() const { - return (unsigned)I.get().n; + return (unsigned long)I.get().n; } inline Nsetiter operator++() { ++I; return I; } inline Nsetiter operator--() { --I; return I; } only in patch2: unchanged: --- cmix-2.0.12.orig/debian/cmix.dirs +++ cmix-2.0.12/debian/cmix.dirs @@ -0,0 +1,19 @@ +usr/share/doc/cmix +usr/bin +usr/lib +usr/share +usr/share/cmix +usr/share/cmix/sys +usr/share/cmix/examples +usr/share/cmix/examples/ack +usr/share/cmix/examples/binsearch +usr/share/cmix/examples/cint +usr/share/cmix/examples/fft +usr/share/cmix/examples/matrix +usr/share/cmix/examples/pow +usr/share/cmix/examples/printf +usr/share/cmix/examples/turing +usr/include +usr/include/cmix +usr/man +usr/man/man1 only in patch2: unchanged: --- cmix-2.0.12.orig/debian/cmix.docs +++ cmix-2.0.12/debian/cmix.docs @@ -0,0 +1 @@ +README