diff -u singular-3-0-4-3.dfsg/debian/changelog singular-3-0-4-3.dfsg/debian/changelog --- singular-3-0-4-3.dfsg/debian/changelog +++ singular-3-0-4-3.dfsg/debian/changelog @@ -1,3 +1,12 @@ +singular (3-0-4-3.dfsg-3.1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. (LP: #627333) Remaining changes: + - debian/patches/: Refresh the following patches: + + sage-bugfixes.patch + + soname.patch + + -- Bilal Akhtar Tue, 31 Aug 2010 13:15:42 +0300 + singular (3-0-4-3.dfsg-3.1) unstable; urgency=low * Non-maintainer upload. @@ -8,6 +17,16 @@ -- Giovanni Mascellani Tue, 10 Aug 2010 11:56:22 +0200 +singular (3-0-4-3.dfsg-3ubuntu1) lucid; urgency=low + + * debian/patches/: Refresh: + + sage-bugfixes.patch + + soname.patch + * debian/patches/fix-invalid-conversion.patch: Use upstream fix + (cast!) for invalid conversion. + + -- Daniel T Chen Sat, 02 Jan 2010 02:21:23 -0500 + singular (3-0-4-3.dfsg-3) unstable; urgency=low * Update readline dependency to "libreadline-dev", not @@ -29,0 +49 @@ + diff -u singular-3-0-4-3.dfsg/debian/control singular-3-0-4-3.dfsg/debian/control --- singular-3-0-4-3.dfsg/debian/control +++ singular-3-0-4-3.dfsg/debian/control @@ -1,7 +1,8 @@ Source: singular Section: math Priority: optional -Maintainer: Tim Abbott +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Tim Abbott Homepage: http://www.singular.uni-kl.de/ Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), libgmp3-dev, libntl-dev, libncurses5-dev, libreadline-dev, libmpfr-dev Standards-Version: 3.8.0 diff -u singular-3-0-4-3.dfsg/debian/control.in singular-3-0-4-3.dfsg/debian/control.in --- singular-3-0-4-3.dfsg/debian/control.in +++ singular-3-0-4-3.dfsg/debian/control.in @@ -1,7 +1,8 @@ Source: singular Section: math Priority: optional -Maintainer: Tim Abbott +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Tim Abbott Homepage: http://www.singular.uni-kl.de/ Build-Depends: @cdbs@, libgmp3-dev, libntl-dev, libncurses5-dev, libreadline-dev, libmpfr-dev Standards-Version: 3.8.0 diff -u singular-3-0-4-3.dfsg/debian/patches/sage-bugfixes.patch singular-3-0-4-3.dfsg/debian/patches/sage-bugfixes.patch --- singular-3-0-4-3.dfsg/debian/patches/sage-bugfixes.patch +++ singular-3-0-4-3.dfsg/debian/patches/sage-bugfixes.patch @@ -1,8 +1,8 @@ -Index: src/kernel/Makefile.in +Index: singular-3-0-4-3.dfsg/kernel/Makefile.in =================================================================== ---- src.orig/kernel/Makefile.in 2008-02-08 17:15:37.000000000 -0800 -+++ src/kernel/Makefile.in 2008-02-08 17:15:53.000000000 -0800 -@@ -316,7 +316,9 @@ +--- singular-3-0-4-3.dfsg.orig/kernel/Makefile.in 2010-01-02 02:21:07.000000000 -0500 ++++ singular-3-0-4-3.dfsg/kernel/Makefile.in 2010-01-02 02:21:10.000000000 -0500 +@@ -292,7 +292,9 @@ install-libsingular: ${MKINSTALLDIRS} ${includedir}/singular diff -u singular-3-0-4-3.dfsg/debian/patches/soname.patch singular-3-0-4-3.dfsg/debian/patches/soname.patch --- singular-3-0-4-3.dfsg/debian/patches/soname.patch +++ singular-3-0-4-3.dfsg/debian/patches/soname.patch @@ -1,7 +1,7 @@ -Index: singular-3-0-4-2+20080405/Singular/Makefile.in +Index: singular-3-0-4-3.dfsg/Singular/Makefile.in =================================================================== ---- singular-3-0-4-2+20080405.orig/Singular/Makefile.in 2008-05-31 15:24:03.000000000 -0400 -+++ singular-3-0-4-2+20080405/Singular/Makefile.in 2008-06-02 14:16:21.000000000 -0400 +--- singular-3-0-4-3.dfsg.orig/Singular/Makefile.in 2010-01-02 02:21:06.000000000 -0500 ++++ singular-3-0-4-3.dfsg/Singular/Makefile.in 2010-01-02 02:22:01.000000000 -0500 @@ -104,25 +104,29 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc_ndebug @@ -35,7 +35,7 @@ LIBSINGULAR_FLAGS = --shared LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc_ndebug -lhtmlhelp endif -@@ -317,9 +321,9 @@ +@@ -318,9 +322,9 @@ fi .cc.o: @@ -47,7 +47,7 @@ %.dl_o : %.cc ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@ -@@ -342,9 +346,13 @@ +@@ -343,9 +347,13 @@ libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \ iparith.o libsingular-tesths.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) @@ -60,9 +60,9 @@ + fi + touch $@ - libsingular-tesths.o: tesths.cc - ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DLIBSINGULAR \ -@@ -526,7 +534,7 @@ + libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \ + iparith.o libsingular-tesths.o libparse.cc claptmpl.o mpsr_Tok.o +@@ -543,7 +551,7 @@ install-libsingular: libsingular for file in *.$(SO_SUFFIX); do \ @@ -71,7 +71,7 @@ done ${INSTALL_PROGRAM} libsingular.h ${includedir} -@@ -545,7 +553,7 @@ +@@ -562,7 +570,7 @@ mostlyclean: -rm -f Singular Singular-static Singulara Singularg Singularp Singularb libparse feOpt*.inc -rm -f *.o *.og core *.op *.ot Singulart *.od *.so* *.dl_o* @@ -80,16 +80,16 @@ clean: mostlyclean -rm -f *.bak *.d *.dd depend -Index: singular-3-0-4-2+20080405/VERSION +Index: singular-3-0-4-3.dfsg/VERSION =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ singular-3-0-4-2+20080405/VERSION 2008-06-02 14:16:21.000000000 -0400 ++++ singular-3-0-4-3.dfsg/VERSION 2010-01-02 02:22:01.000000000 -0500 @@ -0,0 +1 @@ +3-0-4-3 -Index: singular-3-0-4-2+20080405/IntegerProgramming/Makefile.in +Index: singular-3-0-4-3.dfsg/IntegerProgramming/Makefile.in =================================================================== ---- singular-3-0-4-2+20080405.orig/IntegerProgramming/Makefile.in 2008-06-02 14:16:58.000000000 -0400 -+++ singular-3-0-4-2+20080405/IntegerProgramming/Makefile.in 2008-06-02 14:17:09.000000000 -0400 +--- singular-3-0-4-3.dfsg.orig/IntegerProgramming/Makefile.in 2010-01-02 02:21:06.000000000 -0500 ++++ singular-3-0-4-3.dfsg/IntegerProgramming/Makefile.in 2010-01-02 02:22:01.000000000 -0500 @@ -83,6 +83,7 @@ -rm -f ${bindir}/$(MAIN3) -rm -f ${bindir}/$(MAIN4) @@ -98,10 +98,10 @@ $(MAIN1): term_ordering.o binomial.o list.o BigInt.o LLL.o matrix.o \ ideal.o \ -Index: singular-3-0-4-2+20080405/emacs/Makefile.in +Index: singular-3-0-4-3.dfsg/emacs/Makefile.in =================================================================== ---- singular-3-0-4-2+20080405.orig/emacs/Makefile.in 2008-06-02 14:16:36.000000000 -0400 -+++ singular-3-0-4-2+20080405/emacs/Makefile.in 2008-06-02 14:16:51.000000000 -0400 +--- singular-3-0-4-3.dfsg.orig/emacs/Makefile.in 2010-01-02 02:21:06.000000000 -0500 ++++ singular-3-0-4-3.dfsg/emacs/Makefile.in 2010-01-02 02:22:01.000000000 -0500 @@ -40,9 +40,12 @@ ${MAKE} --no-print-directory -s -f ${prefix}/Singular/Makefile echoLIBS > lib-temp ${PERL} lib.pl -s ${singulardir} `cat lib-temp` > lib-cmpl.el