doc++ 3.4.10-3.1 NMU
Hi,
I've uploaded an NMU for doc++ which fixes the FTBFS bug (#292337) along
with some minor issues. Patch attached.
Cheers,
Matej
--- doc++-3.4.10.dist/debian/changelog 2005-05-08 16:39:59.000000000 +0200
+++ doc++-3.4.10/debian/changelog 2005-05-08 18:07:53.000000000 +0200
@@ -1,3 +1,19 @@
+doc++ (3.4.10-3.1) unstable; urgency=high
+
+ * NMU during BSP.
+ * Fix segfault on m68k. Closes: #292337.
+ - src/McSorter.h (sort): Handle one-element lists.
+ - src/McDArray.h (McDArray::McDArray): Don't call malloc() with size 0.
+ - src/html.cc (TOClist::~TOClist): Use delete rather than free() for
+ objects allocated with new.
+ * Fix build failure on amd64 (patch by Andreas Jochens). Closes: #285634.
+ * Remove netpbm-nonfree from Suggests, it's been merged with netpbm.
+ Closes: #271679.
+ * Fix typo in description. Closes: #268502.
+ * Conforms to Standards version 3.6.1.
+
+ -- Matej Vela <vela@debian.org> Sun, 8 May 2005 18:01:47 +0200
+
doc++ (3.4.10-3) unstable; urgency=high
* Reintroducing this package in the archive.
--- doc++-3.4.10.dist/debian/control 2005-05-08 16:39:59.000000000 +0200
+++ doc++-3.4.10/debian/control 2005-05-08 18:07:53.000000000 +0200
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo@debian.org>
Build-Depends: cdbs (>= 0.4.4), debhelper (>= 4.1.0), flex, tetex-extra, gettext
-Standards-Version: 3.6.0
+Standards-Version: 3.6.1
Package: doc++
Section: devel
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: tetex-bin, tetex-extra, gs, netpbm, netpbm-nonfree
+Suggests: tetex-bin, tetex-extra, gs, netpbm
Conflicts: doc++-doc
Replaces: doc++-doc
Description: A documentation system for C/C++, IDL and Java
@@ -25,6 +25,6 @@
* cross references
* high end formating support including typesetting of equations
.
- For more information about DOC++ please take a look at it's home page at
+ For more information about DOC++ please take a look at its home page at
http://docpp.sourceforge.net/
--- doc++-3.4.10.dist/debian/patches/gcc40_build_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ doc++-3.4.10/debian/patches/gcc40_build_fix.patch 2005-05-08 18:07:53.000000000 +0200
@@ -0,0 +1,11 @@
+--- doc++-3.4.10.dist/src/html.cc 2005-05-08 16:43:19.000000000 +0200
++++ doc++-3.4.10/src/html.cc 2005-05-08 17:15:14.000000000 +0200
+@@ -1021,7 +1021,7 @@
+ }
+ }
+
+-struct {
++static struct {
+ int sec;
+ const char *name;
+ } toc_sections[] = {
--- doc++-3.4.10.dist/debian/patches/segfault_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ doc++-3.4.10/debian/patches/segfault_fix.patch 2005-05-08 18:07:53.000000000 +0200
@@ -0,0 +1,52 @@
+--- doc++-3.4.10.dist/src/McSorter.h 2000-07-30 12:41:05.000000000 +0200
++++ doc++-3.4.10/src/McSorter.h 2005-05-08 15:46:50.000000000 +0200
+@@ -46,6 +46,9 @@
+ int i0, i1, j;
+ double c;
+
++ if (start + 1 >= end)
++ return;
++
+ T work, mid, tmp;
+
+ work = t[start];
+@@ -85,7 +88,7 @@
+
+ if(start < i0 - 1)
+ sort(t, i0, compare, start);
+- if(i1 + 1 < end)
++ if(i1 + 1 < end - 1)
+ sort(t, end, compare, i1 + 1);
+ }
+
+--- doc++-3.4.10.dist/src/McDArray.h 2000-07-30 12:40:48.000000000 +0200
++++ doc++-3.4.10/src/McDArray.h 2005-05-08 05:55:58.000000000 +0200
+@@ -80,9 +80,14 @@
+ McDArray(const McDArray& old) : memFactor(old.memFactor),
+ thesize(old.thesize), themax(old.themax)
+ {
+- data = (T*)malloc(themax * sizeof(T));
+- if(thesize)
+- memcpy(data, old.data, thesize * sizeof(T));
++ if (themax)
++ {
++ data = (T*)malloc(themax * sizeof(T));
++ if(thesize)
++ memcpy(data, old.data, thesize * sizeof(T));
++ }
++ else
++ data = 0;
+ assert(isConsistent());
+ }
+
+--- doc++-3.4.10.dist/src/html.cc 2001-02-17 07:34:49.000000000 +0100
++++ doc++-3.4.10/src/html.cc 2005-05-08 14:42:12.000000000 +0200
+@@ -487,7 +487,7 @@
+
+ for(i = 0; i < list.size(); i++)
+ if(list[i].tl)
+- free(list[i].tl);
++ delete list[i].tl;
+ }
+
+ class HIERlist;
Reply to: