[xml/sgml-commit] r171 - in packages/xerces/xerces24/trunk/debian: . patches
Jay Berkenbilt
ejb-guest@haydn.debian.org
Sat, 12 Jun 2004 10:13:17 -0600
Author: ejb-guest
Date: 2004-06-12 10:13:14 -0600 (Sat, 12 Jun 2004)
New Revision: 171
Added:
packages/xerces/xerces24/trunk/debian/libxerces24-doc.README.Debian
packages/xerces/xerces24/trunk/debian/libxerces24-doc.doc-base
packages/xerces/xerces24/trunk/debian/patches/
packages/xerces/xerces24/trunk/debian/patches/gcc-3.4.patch
Modified:
packages/xerces/xerces24/trunk/debian/changelog
packages/xerces/xerces24/trunk/debian/control
packages/xerces/xerces24/trunk/debian/rules
Log:
Incorporate fixes from xerces23 to resolve most outstanding xerces23 bugs
Upgrade to latest ICU libraries
switch from GNU to native transcoder for default version of library
Modified: packages/xerces/xerces24/trunk/debian/changelog
===================================================================
--- packages/xerces/xerces24/trunk/debian/changelog 2004-06-12 16:12:13 UTC (rev 170)
+++ packages/xerces/xerces24/trunk/debian/changelog 2004-06-12 16:13:14 UTC (rev 171)
@@ -1,8 +1,13 @@
xerces24 (2.4.0-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Switch from libicu21 to libicu28
+ * Switch from GNU transcoder to native transcoder
+ * Fix compilation errors with g++ 3.4
+ * Explain in README.Debian for the doc package where the top-level
+ index.html is for the local package.
+ * Register with doc-base
- --
+ -- Jay Berkenbilt <ejb@ql.org> Sat, 12 Jun 2004 11:34:37 -0400
xerces24 (2.4.0-1) unstable; urgency=low
Modified: packages/xerces/xerces24/trunk/debian/control
===================================================================
--- packages/xerces/xerces24/trunk/debian/control 2004-06-12 16:12:13 UTC (rev 170)
+++ packages/xerces/xerces24/trunk/debian/control 2004-06-12 16:13:14 UTC (rev 171)
@@ -1,7 +1,7 @@
Source: xerces24
Section: libs
Priority: extra
-Build-Depends: debhelper (>= 4.0), libicu21-dev, autoconf, xutils, cdbs
+Build-Depends: debhelper (>= 4.0), libicu28-dev, autoconf, xutils, cdbs
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
Uploaders: Ivo Timmermans <ivo@debian.org>, Jay Berkenbilt <ejb@ql.org>
Standards-Version: 3.6.1
@@ -11,6 +11,7 @@
Architecture: any
Depends: libxerces24 (= ${Source-Version}) | libxercesicu24 (= ${Source-Version}), libc6-dev
Conflicts: libxerces21-dev, libxerces23-dev
+Suggests: libxerces24-doc
Description: Validating XML parser library for C++ (development files)
Xerces-C++ is a validating XML parser written in a portable subset of C++.
This package contains the development files for Xerces. It also contains
@@ -28,6 +29,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Conflicts: libxercesicu24
+Suggests: xalan
Description: Validating XML parser library for C++
Xerces-C++ is a validating XML parser written in a portable subset of
C++. Xerces-C++ makes it easy to give your application the ability
@@ -44,6 +46,7 @@
Depends: ${shlibs:Depends}
Conflicts: libxerces24
Provides: libxerces24
+Suggests: xalan
Description: Validating XML parser library for C++
Xerces-C++ is a validating XML parser written in a portable subset of
C++. Xerces-C++ makes it easy to give your application the ability
Added: packages/xerces/xerces24/trunk/debian/libxerces24-doc.README.Debian
===================================================================
--- packages/xerces/xerces24/trunk/debian/libxerces24-doc.README.Debian 2004-06-12 16:12:13 UTC (rev 170)
+++ packages/xerces/xerces24/trunk/debian/libxerces24-doc.README.Debian 2004-06-12 16:13:14 UTC (rev 171)
@@ -0,0 +1,5 @@
+The file "index.html" here contains a redirect to xml.apache.org,
+Apache's top-level xml site. The top-level file for the documentation
+for this package may be found in html/index.html.
+
+ -- Jay Berkenbilt <ejb@ql.org>, Sat Jun 12 11:35:11 2004
Added: packages/xerces/xerces24/trunk/debian/libxerces24-doc.doc-base
===================================================================
--- packages/xerces/xerces24/trunk/debian/libxerces24-doc.doc-base 2004-06-12 16:12:13 UTC (rev 170)
+++ packages/xerces/xerces24/trunk/debian/libxerces24-doc.doc-base 2004-06-12 16:13:14 UTC (rev 171)
@@ -0,0 +1,12 @@
+Document: libxerces24-doc
+Title: Xerces-C++ Documentation v2.4.0
+Author: The Apache Software Foundation
+Abstract: The Xerces C++ documentation includes general information,
+ documentation of the Xerces API, FAQs, release information, sample
+ code, and a lot of other useful information about the Xerces
+ validating XML parser.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libxerces24-doc/html/index.html
+Files: /usr/share/doc/libxerces24-doc/html/*
Added: packages/xerces/xerces24/trunk/debian/patches/gcc-3.4.patch
===================================================================
--- packages/xerces/xerces24/trunk/debian/patches/gcc-3.4.patch 2004-06-12 16:12:13 UTC (rev 170)
+++ packages/xerces/xerces24/trunk/debian/patches/gcc-3.4.patch 2004-06-12 16:13:14 UTC (rev 171)
@@ -0,0 +1,67 @@
+--- xerces-c-src2_4_0/src/xercesc/util/RefArrayOf.c~ 2003-05-16 02:01:52.000000000 -0400
++++ xerces-c-src2_4_0/src/xercesc/util/RefArrayOf.c 2004-06-12 11:39:28.000000000 -0400
+@@ -105,7 +105,7 @@
+ , fArray(0)
+ , fMemoryManager(manager)
+ {
+- fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
++ fArray = (TElem**) this->fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
+ for (unsigned int index = 0; index < fSize; index++)
+ fArray[index] = 0;
+ }
+@@ -119,7 +119,7 @@
+ , fArray(0)
+ , fMemoryManager(manager)
+ {
+- fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
++ fArray = (TElem**) this->fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
+ for (unsigned int index = 0; index < fSize; index++)
+ fArray[index] = values[index];
+ }
+@@ -131,14 +131,14 @@
+ , fArray(0)
+ , fMemoryManager(source.fMemoryManager)
+ {
+- fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
++ fArray = (TElem**) this->fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
+ for (unsigned int index = 0; index < fSize; index++)
+ fArray[index] = source.fArray[index];
+ }
+
+ template <class TElem> RefArrayOf<TElem>::~RefArrayOf()
+ {
+- fMemoryManager->deallocate(fArray);//delete [] fArray;
++ this->fMemoryManager->deallocate(fArray);//delete [] fArray;
+ }
+
+
+@@ -170,9 +170,9 @@
+ // Reallocate if not the same size
+ if (toAssign.fSize != fSize)
+ {
+- fMemoryManager->deallocate(fArray);//delete [] fArray;
++ this->fMemoryManager->deallocate(fArray);//delete [] fArray;
+ fSize = toAssign.fSize;
+- fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
++ fArray = (TElem**) this->fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
+ }
+
+ // Copy over the source elements
+@@ -270,7 +270,7 @@
+ ThrowXML(IllegalArgumentException, XMLExcepts::Array_BadNewSize);
+
+ // Allocate the new array
+- TElem** newArray = (TElem**) fMemoryManager->allocate
++ TElem** newArray = (TElem**) this->fMemoryManager->allocate
+ (
+ newSize * sizeof(TElem*)
+ );//new TElem*[newSize];
+@@ -284,7 +284,7 @@
+ newArray[index] = 0;
+
+ // Delete the old array and udpate our members
+- fMemoryManager->deallocate(fArray);//delete [] fArray;
++ this->fMemoryManager->deallocate(fArray);//delete [] fArray;
+ fArray = newArray;
+ fSize = newSize;
+ }
Modified: packages/xerces/xerces24/trunk/debian/rules
===================================================================
--- packages/xerces/xerces24/trunk/debian/rules 2004-06-12 16:12:13 UTC (rev 170)
+++ packages/xerces/xerces24/trunk/debian/rules 2004-06-12 16:13:14 UTC (rev 171)
@@ -62,10 +62,9 @@
$(l_PWD)/$(l_CLEAN_BUILD_DIR)/Readme.html
DEB_COMPRESS_EXCLUDE = sample html
-# Include cdbs rules files. If patches are required, uncomment the
-# simple-patchsys line below and add patches to debian/patches.
+# Include cdbs rules files.
include /usr/share/cdbs/1/rules/tarball.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/debhelper.mk
# Environment variables used by the build
@@ -112,7 +111,7 @@
# defined above.
$(l_STAMPS)/configure/$(l_NATIVE_BUILD): $(l_STAMPS)/lndir/$(l_NATIVE_BUILD)
- $(subst __BUILD_DIR__,$(l_NATIVE_BUILD_DIR),$(subst __TRANSCODER__,IconvGNU,$(l_configure)))
+ $(subst __BUILD_DIR__,$(l_NATIVE_BUILD_DIR),$(subst __TRANSCODER__,native,$(l_configure)))
$(l_STAMPS)/configure/$(l_ICU_BUILD): $(l_STAMPS)/lndir/$(l_ICU_BUILD)
$(subst __BUILD_DIR__,$(l_ICU_BUILD_DIR),$(subst __TRANSCODER__,icu,$(l_configure)))