Package: jade
Version: 1.2.1-43.1
Severity: normal
I'm making an NMU with the attached patch and uploading to
DELAYED/2-day. From the changes file:
jade (1.2.1-43.1) unstable; urgency=low
.
* NMU
* Fix compilation with g++-4.0. Closes: #308810.
* g++-4.0 transition: rename libsp1 to libsp1c2.
-- System Information:
Debian Release: testing/unstable
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-9-amd64-k8
Locale: LANG=en, LC_CTYPE=en (charmap=UTF-8) (ignored: LC_ALL set to
en_US.UTF-8)
Versions of packages jade depends on:
ii libc6 2.3.2.ds1-22 GNU C Library: Shared libraries an
ii libgcc1 1:4.0.1-2 GCC support library
ii libsp1c2 1.3.4-1.2.1-43.1 Runtime library for James Clark's
ii libstdc++6 4.0.1-2 The GNU Standard C++ Library v3
ii sgml-base 1.26 SGML infrastructure and SGML catal
jade recommends no packages.
-- no debconf information
--
Daniel Schepler "Please don't disillusion me. I
[EMAIL PROTECTED] haven't had breakfast yet."
-- Orson Scott Card
diff -urN jade-1.2.1.old/config/config.guess jade-1.2.1/config/config.guess
--- jade-1.2.1.old/config/config.guess 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/config/config.guess 2005-07-15 11:28:16.000000000 -0700
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-12'
+timestamp='2005-04-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -804,6 +804,9 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@@ -1137,6 +1140,10 @@
# From [EMAIL PROTECTED]
echo i860-stratus-sysv4
exit 0 ;;
+ i*86:VOS:*:*)
+ # From [EMAIL PROTECTED]
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit 0 ;;
*:VOS:*:*)
# From [EMAIL PROTECTED]
echo hppa1.1-stratus-vos
@@ -1197,6 +1204,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
@@ -1413,7 +1423,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff -urN jade-1.2.1.old/config/config.sub jade-1.2.1/config/config.sub
--- jade-1.2.1.old/config/config.sub 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/config/config.sub 2005-07-15 11:28:16.000000000 -0700
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-30'
+timestamp='2005-04-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -231,13 +231,14 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -262,7 +263,8 @@
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
@@ -298,7 +300,7 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
- | bs2000-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
@@ -310,7 +312,7 @@
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -336,7 +338,8 @@
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
diff -urN jade-1.2.1.old/debian/changelog jade-1.2.1/debian/changelog
--- jade-1.2.1.old/debian/changelog 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/debian/changelog 2005-07-15 11:17:33.000000000 -0700
@@ -1,3 +1,11 @@
+jade (1.2.1-43.1) unstable; urgency=low
+
+ * NMU
+ * Fix compilation with g++-4.0. Closes: #308810.
+ * g++-4.0 transition: rename libsp1 to libsp1c2.
+
+ -- Daniel Schepler <[EMAIL PROTECTED]> Fri, 15 Jul 2005 11:17:33 -0700
+
jade (1.2.1-43) unstable; urgency=high
* RC bug fix: Make libsp1 conflict with jade earlier than 1.2.1-30 to
diff -urN jade-1.2.1.old/debian/control jade-1.2.1/debian/control
--- jade-1.2.1.old/debian/control 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/debian/control 2005-07-15 11:15:46.000000000 -0700
@@ -19,12 +19,12 @@
Author: James Clark <[EMAIL PROTECTED]>
Homepage: http://www.jclark.com/sp/
-Package: libsp1
+Package: libsp1c2
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Replaces: sp (<= 1.3-1.1-6)
-Conflicts: sp (<= 1.3-1.1-6), jade (<< 1.2.1-30)
+Replaces: sp (<= 1.3-1.1-6), libsp1
+Conflicts: sp (<= 1.3-1.1-6), jade (<< 1.2.1-30), libsp1
Description: Runtime library for James Clark's SP suite
This is the SP suite's shared library runtime support. This C++
library contains entity management functions, parsing functions, and
@@ -38,7 +38,7 @@
Package: libsp1-dev
Architecture: any
Section: libdevel
-Depends: ${libsp1:Version}, libc6-dev, libstdc++-dev
+Depends: ${libsp1c2:Version}, libc6-dev, libstdc++-dev
Replaces: sp-dev
Conflicts: sp-dev
Recommends: c++-compiler
diff -urN jade-1.2.1.old/debian/libsp1c2.postinst jade-1.2.1/debian/libsp1c2.postinst
--- jade-1.2.1.old/debian/libsp1c2.postinst 1969-12-31 16:00:00.000000000 -0800
+++ jade-1.2.1/debian/libsp1c2.postinst 2005-07-15 11:11:15.000000000 -0700
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = configure ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
diff -urN jade-1.2.1.old/debian/libsp1c2.postrm jade-1.2.1/debian/libsp1c2.postrm
--- jade-1.2.1.old/debian/libsp1c2.postrm 1969-12-31 16:00:00.000000000 -0800
+++ jade-1.2.1/debian/libsp1c2.postrm 2005-07-15 11:11:15.000000000 -0700
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
diff -urN jade-1.2.1.old/debian/libsp1.postinst jade-1.2.1/debian/libsp1.postinst
--- jade-1.2.1.old/debian/libsp1.postinst 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/debian/libsp1.postinst 1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = configure ]; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff -urN jade-1.2.1.old/debian/libsp1.postrm jade-1.2.1/debian/libsp1.postrm
--- jade-1.2.1.old/debian/libsp1.postrm 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/debian/libsp1.postrm 1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff -urN jade-1.2.1.old/debian/rules jade-1.2.1/debian/rules
--- jade-1.2.1.old/debian/rules 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/debian/rules 2005-07-15 11:15:11.000000000 -0700
@@ -9,7 +9,7 @@
pkg-sp := sp
pkg-jade := jade
-pkg-libsp1 := libsp1
+pkg-libsp1 := libsp1c2
pkg-libsp1-dev := libsp1-dev
# default SGML dir
@@ -56,7 +56,7 @@
#export DH_VERBOSE=1
# first version of package providing the right shlibs
-SHLIBS_PKGVER := 1.3.4-1.2.1-30
+SHLIBS_PKGVER := 1.3.4-1.2.1-43.1
# determine our version numbers
SRC_VERSION := $(shell LC_ALL=C dpkg-parsechangelog | sed -n 's/^Version: *//p')
diff -urN jade-1.2.1.old/include/config.h jade-1.2.1/include/config.h
--- jade-1.2.1.old/include/config.h 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/include/config.h 2005-07-15 11:12:21.000000000 -0700
@@ -30,6 +30,7 @@
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
#define SP_ANSI_LIB
#undef SP_NEW_H_MISSING
+#define SP_HAVE_TYPENAME
#endif
#if (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
#define SP_NO_STD_NAMESPACE
diff -urN jade-1.2.1.old/include/RangeMap.h jade-1.2.1/include/RangeMap.h
--- jade-1.2.1.old/include/RangeMap.h 2005-07-15 11:11:15.000000000 -0700
+++ jade-1.2.1/include/RangeMap.h 2005-07-15 11:12:21.000000000 -0700
@@ -54,7 +54,7 @@
}
private:
size_t count_;
- class Vector<RangeMapRange<From,To> >::const_iterator ptr_;
+ typename Vector<RangeMapRange<From,To> >::const_iterator ptr_;
};
#ifdef SP_NAMESPACE
