[xml/sgml-commit] r172 - in packages/xerces/xerces25/trunk/debian: . patches

Jay Berkenbilt ejb-guest@haydn.debian.org
Sat, 12 Jun 2004 10:13:56 -0600


Author: ejb-guest
Date: 2004-06-12 10:13:53 -0600 (Sat, 12 Jun 2004)
New Revision: 172

Added:
   packages/xerces/xerces25/trunk/debian/libxerces25-doc.README.Debian
   packages/xerces/xerces25/trunk/debian/libxerces25-doc.doc-base
   packages/xerces/xerces25/trunk/debian/patches/gcc-3.4.patch
Modified:
   packages/xerces/xerces25/trunk/debian/changelog
   packages/xerces/xerces25/trunk/debian/control
   packages/xerces/xerces25/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/xerces25/trunk/debian/changelog
===================================================================
--- packages/xerces/xerces25/trunk/debian/changelog	2004-06-12 16:13:14 UTC (rev 171)
+++ packages/xerces/xerces25/trunk/debian/changelog	2004-06-12 16:13:53 UTC (rev 172)
@@ -1,12 +1,16 @@
 xerces25 (2.5.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 10:01:42 -0400
 
 xerces25 (2.5.0-1) unstable; urgency=low
 
   * Initial release.
 
  -- Jay Berkenbilt <ejb@ql.org>  Sun, 18 Apr 2004 20:45:37 -0400
-

Modified: packages/xerces/xerces25/trunk/debian/control
===================================================================
--- packages/xerces/xerces25/trunk/debian/control	2004-06-12 16:13:14 UTC (rev 171)
+++ packages/xerces/xerces25/trunk/debian/control	2004-06-12 16:13:53 UTC (rev 172)
@@ -1,7 +1,7 @@
 Source: xerces25
 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: libxerces25 (= ${Source-Version}) | libxercesicu25 (= ${Source-Version}), libc6-dev
 Conflicts: libxerces21-dev, libxerces23-dev, libxerces24-dev
+Suggests: libxerces25-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: libxercesicu25
+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: libxerces25
 Provides: libxerces25
+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/xerces25/trunk/debian/libxerces25-doc.README.Debian
===================================================================
--- packages/xerces/xerces25/trunk/debian/libxerces25-doc.README.Debian	2004-06-12 16:13:14 UTC (rev 171)
+++ packages/xerces/xerces25/trunk/debian/libxerces25-doc.README.Debian	2004-06-12 16:13:53 UTC (rev 172)
@@ -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:10:14 2004

Added: packages/xerces/xerces25/trunk/debian/libxerces25-doc.doc-base
===================================================================
--- packages/xerces/xerces25/trunk/debian/libxerces25-doc.doc-base	2004-06-12 16:13:14 UTC (rev 171)
+++ packages/xerces/xerces25/trunk/debian/libxerces25-doc.doc-base	2004-06-12 16:13:53 UTC (rev 172)
@@ -0,0 +1,12 @@
+Document: libxerces25-doc
+Title: Xerces-C++ Documentation v2.5.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/libxerces25-doc/html/index.html
+Files: /usr/share/doc/libxerces25-doc/html/*

Added: packages/xerces/xerces25/trunk/debian/patches/gcc-3.4.patch
===================================================================
--- packages/xerces/xerces25/trunk/debian/patches/gcc-3.4.patch	2004-06-12 16:13:14 UTC (rev 171)
+++ packages/xerces/xerces25/trunk/debian/patches/gcc-3.4.patch	2004-06-12 16:13:53 UTC (rev 172)
@@ -0,0 +1,98 @@
+--- xerces-c-src_2_5_0/src/xercesc/util/RefArrayOf.c.gcc34	2003-12-16 19:18:35.000000000 -0500
++++ xerces-c-src_2_5_0/src/xercesc/util/RefArrayOf.c	2004-06-12 11:01:30.000000000 -0400
+@@ -108,7 +108,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;
+ }
+@@ -122,7 +122,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];
+ }
+@@ -134,14 +134,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;
+ }
+ 
+ 
+@@ -152,7 +152,7 @@
+ operator[](const unsigned int index)
+ {
+     if (index >= fSize)
+-        ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, fMemoryManager);
++        ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, this->fMemoryManager);
+     return fArray[index];
+ }
+ 
+@@ -160,7 +160,7 @@
+ operator[](const unsigned int index) const
+ {
+     if (index >= fSize)
+-        ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, fMemoryManager);
++        ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, this->fMemoryManager);
+     return fArray[index];
+ }
+ 
+@@ -173,9 +173,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
+@@ -249,7 +249,7 @@
+ template <class TElem> void RefArrayOf<TElem>::deleteAt(const unsigned int index)
+ {
+     if (index >= fSize)
+-        ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, fMemoryManager);
++        ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, this->fMemoryManager);
+ 
+     delete fArray[index];
+     fArray[index] = 0;
+@@ -270,10 +270,10 @@
+         return;
+ 
+     if (newSize < fSize)
+-        ThrowXMLwithMemMgr(IllegalArgumentException, XMLExcepts::Array_BadNewSize, fMemoryManager);
++        ThrowXMLwithMemMgr(IllegalArgumentException, XMLExcepts::Array_BadNewSize, this->fMemoryManager);
+ 
+     // Allocate the new array
+-    TElem** newArray = (TElem**) fMemoryManager->allocate
++    TElem** newArray = (TElem**) this->fMemoryManager->allocate
+     (
+         newSize * sizeof(TElem*)
+     );//new TElem*[newSize];
+@@ -287,7 +287,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/xerces25/trunk/debian/rules
===================================================================
--- packages/xerces/xerces25/trunk/debian/rules	2004-06-12 16:13:14 UTC (rev 171)
+++ packages/xerces/xerces25/trunk/debian/rules	2004-06-12 16:13:53 UTC (rev 172)
@@ -111,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)))