Author: paulcager-guest
Date: 2007-07-02 21:48:13 +0000 (Mon, 02 Jul 2007)
New Revision: 3771
Added:
trunk/doc++/debian/patches/gcc40_build_fix.patch
trunk/doc++/debian/patches/gcc41_build_fix.patch
trunk/doc++/debian/patches/segfault_fix.patch
Modified:
trunk/doc++/debian/changelog
trunk/doc++/debian/control
Log:
Added missing versions (and NMUs) to svn
Modified: trunk/doc++/debian/changelog
===================================================================
--- trunk/doc++/debian/changelog 2007-07-02 21:42:42 UTC (rev 3770)
+++ trunk/doc++/debian/changelog 2007-07-02 21:48:13 UTC (rev 3771)
@@ -1,3 +1,56 @@
+doc++ (3.4.10-3.4) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * Revert GCC 3.3 builds patch since it introduced illegal syntax.
+ * Add GCC 4.1 build fix from Jeremy Nimmer (Closes: #339921).
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]> Thu, 25 May 2006 17:57:50 +0200
+
+doc++ (3.4.10-3.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Update aclocal.m4 to not install locale.alias (Closes: #354048).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Fri, 10 Mar 2006 16:29:38 +0100
+
+doc++ (3.4.10-3.2) unstable; urgency=high
+
+ * NMU.
+ * Fix another segfault on m68k. Closes: #292337.
+ - src/McDirectory.h, src/McDirectory.cc, src/html.cc, src/readfiles.ll:
+ Use std::sort instead of home-brewn code. (I have no idea why the
+ latter crashes--replacing the algorithm doesn't help.)
+
+ -- Matej Vela <[EMAIL PROTECTED]> Tue, 10 May 2005 15:17:00 +0200
+
+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 <[EMAIL PROTECTED]> Sun, 8 May 2005 18:01:47 +0200
+
+doc++ (3.4.10-3) unstable; urgency=high
+
+ * Reintroducing this package in the archive.
+ It was requested to be removed by the maintainer in #265273, but
+ it is needed by other packages.
+ (Closes: #269962, #269961, #269998, #269999, #270000, #270002, #270004)
+
+ * Urgency high, as this package is also needed in testing.
+ * Forced to get this package by ftpmasters
+
+ -- Jose Carlos Garcia Sogo <[EMAIL PROTECTED]> Mon, 6 Sep 2004 20:53:51
+0200
+
doc++ (3.4.10-2) unstable; urgency=low
* Use CDBS for debian/rules with patches in debian/patches
Modified: trunk/doc++/debian/control
===================================================================
--- trunk/doc++/debian/control 2007-07-02 21:42:42 UTC (rev 3770)
+++ trunk/doc++/debian/control 2007-07-02 21:48:13 UTC (rev 3771)
@@ -1,16 +1,16 @@
Source: doc++
Section: devel
Priority: optional
-Maintainer: Stefan Gybas <[EMAIL PROTECTED]>
+Maintainer: Jose Carlos Garcia Sogo <[EMAIL PROTECTED]>
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/
Added: trunk/doc++/debian/patches/gcc40_build_fix.patch
===================================================================
--- trunk/doc++/debian/patches/gcc40_build_fix.patch
(rev 0)
+++ trunk/doc++/debian/patches/gcc40_build_fix.patch 2007-07-02 21:48:13 UTC
(rev 3771)
@@ -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[] = {
Added: trunk/doc++/debian/patches/gcc41_build_fix.patch
===================================================================
--- trunk/doc++/debian/patches/gcc41_build_fix.patch
(rev 0)
+++ trunk/doc++/debian/patches/gcc41_build_fix.patch 2007-07-02 21:48:13 UTC
(rev 3771)
@@ -0,0 +1,11 @@
+--- doc++-3.4.10/src/docify.ll~ 2006-05-25 15:55:35.000000000 +0000
++++ doc++-3.4.10/src/docify.ll 2006-05-25 15:55:47.000000000 +0000
+@@ -314,7 +314,7 @@
+ {
+ if(argv[1][0] == '-')
+ {
+- fprintf(stderr, "Usage: docify [infile [outfile]]\n");
++ fprintf(stderr, "Usage: docify [infile [outfile]""]\n");
+ return 0;
+ }
+ ain = fopen(argv[1], "r");
Added: trunk/doc++/debian/patches/segfault_fix.patch
===================================================================
--- trunk/doc++/debian/patches/segfault_fix.patch
(rev 0)
+++ trunk/doc++/debian/patches/segfault_fix.patch 2007-07-02 21:48:13 UTC
(rev 3771)
@@ -0,0 +1,167 @@
+--- 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-10 15:02:06.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/McDirectory.cc 2000-03-14 22:17:36.000000000
+0100
++++ doc++-3.4.10/src/McDirectory.cc 2005-05-10 15:02:18.000000000 +0200
+@@ -23,12 +23,13 @@
+ */
+
+ #include "McDirectory.h"
+-#include "McSorter.h"
+ #include "McString.h"
+ #include "doc.h"
+
+ #include <stdio.h>
+
++#include <algorithm>
++
+ #ifdef WIN32
+ #include <windows.h>
+ #ifdef __BORLANDC__
+@@ -62,7 +63,7 @@
+ FindClose(searchHandle);
+ StringCompare comp;
+ if(list.size())
+- sort((char **)list, list.size(), comp, 0);
++ std::sort((char **)list, (char **)list + list.size(), comp);
+ return 0;
+ }
+
+@@ -107,7 +108,7 @@
+ closedir(dir);
+ StringCompare comp;
+ if(list.size())
+- sort((char **)list, list.size(), comp, 0);
++ std::sort((char **)list, (char **)list + list.size(), comp);
+ return list.size();
+ }
+
+--- doc++-3.4.10.dist/src/McDirectory.h 2000-06-28 21:54:58.000000000
+0200
++++ doc++-3.4.10/src/McDirectory.h 2005-05-10 15:02:18.000000000 +0200
+@@ -59,9 +59,9 @@
+ class StringCompare
+ {
+ public:
+- int operator()(const char *t1, const char *t2)
++ bool operator()(const char *t1, const char *t2)
+ {
+- return strcmp(t1, t2);
++ return strcmp(t1, t2) < 0;
+ }
+ };
+ };
+--- 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-10 15:02:18.000000000 +0200
+@@ -38,9 +38,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
++#include <algorithm>
++
+ #include "McDirectory.h"
+ #include "McHashTable.h"
+-#include "McSorter.h"
+ #include "classgraph.h"
+ #include "doc.h"
+ #include "gifs.h"
+@@ -314,9 +315,11 @@
+ virtual void writeMember(Entry *e, bool links, bool withSub = true);
+ class EntryCompare {
+ public:
+- int operator()(const MemberWriterListEntry& l1, const
MemberWriterListEntry& l2)
++ bool operator()(const MemberWriterListEntry& l1, const
MemberWriterListEntry& l2)
+ {
+- return strcmp(l1.entry->fullName.c_str(),
l2.entry->fullName.c_str());
++ const char *s1 = l1.entry->fullName.c_str();
++ const char *s2 = l2.entry->fullName.c_str();
++ return strcmp(s1, s2) < 0;
+ }
+ };
+ public:
+@@ -324,7 +327,7 @@
+ {
+ EntryCompare comp;
+ if(list.size())
+- ::sort((MemberWriterListEntry *)list, list.size(), comp, 0);
++ std::sort((MemberWriterListEntry *)list, (MemberWriterListEntry
*)list + list.size(), comp);
+ }
+ virtual void startList(FILE *f, char *heading, bool withLinks);
+ virtual void addMember(Entry *e, bool links, bool withSub = true)
+@@ -376,7 +379,7 @@
+ int lp;
+
+ if(list.size() > 1)
+- ::sort((TOCListEntry *)list, list.size(), comp, 0);
++ std::sort((TOCListEntry *)list, (TOCListEntry *)list +
list.size(), comp);
+
+ // Sort subsections
+ for(lp = 0; lp < list.size(); lp++)
+@@ -385,9 +388,9 @@
+ }
+ class EntryCompare {
+ public:
+- int operator()(TOCListEntry& l1, TOCListEntry& l2)
++ bool operator()(const TOCListEntry& l1, const TOCListEntry& l2)
+ {
+- return strcmp(l1.name, l2.name);
++ return strcmp(l1.name, l2.name) < 0;
+ }
+ };
+ void addEntry(Entry *entry, TOClist *tl);
+@@ -487,7 +490,7 @@
+
+ for(i = 0; i < list.size(); i++)
+ if(list[i].tl)
+- free(list[i].tl);
++ delete list[i].tl;
+ }
+
+ class HIERlist;
+@@ -509,7 +512,7 @@
+ int i;
+
+ if(list.size() > 1)
+- ::sort((HIERListEntry *)list, list.size(), comp, 0);
++ std::sort((HIERListEntry *)list, (HIERListEntry *)list +
list.size(), comp);
+
+ // Sort subentries
+ for(i = 0; i < list.size(); i++)
+@@ -519,9 +522,9 @@
+ class EntryCompare
+ {
+ public:
+- int operator()(HIERListEntry& l1, HIERListEntry& l2)
++ bool operator()(const HIERListEntry& l1, const HIERListEntry&
l2)
+ {
+- return strcmp(l1.name, l2.name);
++ return strcmp(l1.name, l2.name) < 0;
+ }
+ };
+ void addEntry(Entry *entry, HIERlist *hl);
+--- doc++-3.4.10.dist/src/readfiles.ll 2001-11-25 18:04:48.000000000 +0100
++++ doc++-3.4.10/src/readfiles.ll 2005-05-10 15:02:18.000000000 +0200
+@@ -28,7 +28,6 @@
+ #include <sys/types.h>
+
+ #include "McDirectory.h"
+-#include "McSorter.h"
+ #include "McString.h"
+ #include "doc.h"
+ #include "nametable.h"
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
