[xml/sgml-commit] r416 - packages/xerces/xerces26/trunk/debian
Jay Berkenbilt
qjb@costa.debian.org
Sat, 09 Jul 2005 20:09:42 +0000
Author: qjb
Date: 2005-07-09 20:09:41 +0000 (Sat, 09 Jul 2005)
New Revision: 416
Added:
packages/xerces/xerces26/trunk/debian/libxerces26c2.shlibs
packages/xerces/xerces26/trunk/debian/libxercesicu26c2.shlibs
Removed:
packages/xerces/xerces26/trunk/debian/libxerces26.shlibs
packages/xerces/xerces26/trunk/debian/libxercesicu26.shlibs
Modified:
packages/xerces/xerces26/trunk/debian/changelog
packages/xerces/xerces26/trunk/debian/control
packages/xerces/xerces26/trunk/debian/rules
Log:
g++ 4.0 transition, standards version, remove Ivo as uploader
Modified: packages/xerces/xerces26/trunk/debian/changelog
===================================================================
--- packages/xerces/xerces26/trunk/debian/changelog 2005-07-09 20:08:27 UTC (rev 415)
+++ packages/xerces/xerces26/trunk/debian/changelog 2005-07-09 20:09:41 UTC (rev 416)
@@ -1,3 +1,10 @@
+xerces26 (2.6.0-4) unstable; urgency=low
+
+ * g++ 4.0 transition: libxerces26 is now libxerces26c2; libxercesicu26
+ is now libxercesicu26c2.
+
+ -- Jay Berkenbilt <qjb@debian.org> Sat, 9 Jul 2005 16:05:48 -0400
+
xerces26 (2.6.0-3) unstable; urgency=low
* Changed dependency on libc6-dev to libc6-dev | libc-dev
Modified: packages/xerces/xerces26/trunk/debian/control
===================================================================
--- packages/xerces/xerces26/trunk/debian/control 2005-07-09 20:08:27 UTC (rev 415)
+++ packages/xerces/xerces26/trunk/debian/control 2005-07-09 20:09:41 UTC (rev 416)
@@ -3,13 +3,13 @@
Priority: extra
Build-Depends: debhelper (>= 4.1.0), libicu21-dev, xutils, cdbs
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
-Uploaders: Jay Berkenbilt <qjb@debian.org>, Ivo Timmermans <ivo@debian.org>
-Standards-Version: 3.6.1
+Uploaders: Jay Berkenbilt <qjb@debian.org>
+Standards-Version: 3.6.2
Package: libxerces26-dev
Section: libdevel
Architecture: any
-Depends: libxerces26 (= ${Source-Version}) | libxercesicu26 (= ${Source-Version}), libc6-dev | libc-dev
+Depends: libxerces26c2 (= ${Source-Version}) | libxercesicu26c2 (= ${Source-Version}), libc6-dev | libc-dev
Conflicts: libxerces21-dev, libxerces23-dev, libxerces24-dev, libxerces25-dev
Suggests: libxerces26-doc
Description: Validating XML parser library for C++ (development files)
@@ -25,10 +25,11 @@
Xerces-C++ is a validating XML parser written in a portable subset of C++.
This package contains the documentation files.
-Package: libxerces26
+Package: libxerces26c2
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libxercesicu26
+Conflicts: libxercesicu26, libxerces26, libxercesicu26c2
+Replaces: libxerce26
Suggests: xalan
Description: Validating XML parser library for C++
Xerces-C++ is a validating XML parser written in a portable subset of
@@ -44,16 +45,16 @@
This version of the Xerces-C++ library uses the xerces native
transcoder which is not capable of loading external encodings. If
you need to process XML files encoded in other than ASCII,
- ISO-8859-1, or UTF-8, please use libxercesicu26 instead. A future
+ ISO-8859-1, or UTF-8, please use libxercesicu26c2 instead. A future
version of these packages may drop support for the native transcoder
entirely.
-Package: libxercesicu26
+Package: libxercesicu26c2
Architecture: any
Depends: ${shlibs:Depends}
Recommends: icu
-Conflicts: libxerces26
-Provides: libxerces26
+Conflicts: libxerces26, libxerces26c2, libxercesicu26
+Provides: libxerces26c2
Suggests: xalan
Description: Validating XML parser library for C++
Xerces-C++ is a validating XML parser written in a portable subset of
Deleted: packages/xerces/xerces26/trunk/debian/libxerces26.shlibs
===================================================================
--- packages/xerces/xerces26/trunk/debian/libxerces26.shlibs 2005-07-09 20:08:27 UTC (rev 415)
+++ packages/xerces/xerces26/trunk/debian/libxerces26.shlibs 2005-07-09 20:09:41 UTC (rev 416)
@@ -1,2 +0,0 @@
-libxerces-c 26 libxerces26
-libxerces-depdom 26 libxerces26
Copied: packages/xerces/xerces26/trunk/debian/libxerces26c2.shlibs (from rev 373, packages/xerces/xerces26/trunk/debian/libxerces26.shlibs)
===================================================================
--- packages/xerces/xerces26/trunk/debian/libxerces26.shlibs 2005-03-23 02:07:31 UTC (rev 373)
+++ packages/xerces/xerces26/trunk/debian/libxerces26c2.shlibs 2005-07-09 20:09:41 UTC (rev 416)
@@ -0,0 +1,2 @@
+libxerces-c 26 libxerces26c2
+libxerces-depdom 26 libxerces26c2
Deleted: packages/xerces/xerces26/trunk/debian/libxercesicu26.shlibs
===================================================================
--- packages/xerces/xerces26/trunk/debian/libxercesicu26.shlibs 2005-07-09 20:08:27 UTC (rev 415)
+++ packages/xerces/xerces26/trunk/debian/libxercesicu26.shlibs 2005-07-09 20:09:41 UTC (rev 416)
@@ -1,8 +0,0 @@
-# We purposely require libxerces26 rather than libxercesicu26 here
-# since libxercesicu26 provides libxerces26 and is expected to
-# disappear in a future release of this package (when the default uses
-# icu). The xerces libraries in both the regular and icu versions of
-# the package have identical ABIs -- the differences are only in which
-# files are loaded at runtime.
-libxerces-c 26 libxerces26
-libxerces-depdom 26 libxerces26
Copied: packages/xerces/xerces26/trunk/debian/libxercesicu26c2.shlibs (from rev 373, packages/xerces/xerces26/trunk/debian/libxercesicu26.shlibs)
===================================================================
--- packages/xerces/xerces26/trunk/debian/libxercesicu26.shlibs 2005-03-23 02:07:31 UTC (rev 373)
+++ packages/xerces/xerces26/trunk/debian/libxercesicu26c2.shlibs 2005-07-09 20:09:41 UTC (rev 416)
@@ -0,0 +1,8 @@
+# We purposely require libxerces26 rather than libxercesicu26 here
+# since libxercesicu26 provides libxerces26 and is expected to
+# disappear in a future release of this package (when the default uses
+# icu). The xerces libraries in both the regular and icu versions of
+# the package have identical ABIs -- the differences are only in which
+# files are loaded at runtime.
+libxerces-c 26 libxerces26c2
+libxerces-depdom 26 libxerces26c2
Modified: packages/xerces/xerces26/trunk/debian/rules
===================================================================
--- packages/xerces/xerces26/trunk/debian/rules 2005-07-09 20:08:27 UTC (rev 415)
+++ packages/xerces/xerces26/trunk/debian/rules 2005-07-09 20:09:41 UTC (rev 416)
@@ -63,8 +63,8 @@
# Variables used by cdbs
DEB_TAR_SRCDIR = xerces-c-src_2_6_0
-DEB_INSTALL_DIRS_libxerces26 = /usr/lib
-DEB_INSTALL_DIRS_libxercesicu26 = /usr/lib
+DEB_INSTALL_DIRS_libxerces26c2 = /usr/lib
+DEB_INSTALL_DIRS_libxercesicu26c2 = /usr/lib
DEB_INSTALL_DIRS_libxerces26-dev = /usr/include /usr/lib/$(l_PKGNAME)
DEB_INSTALL_EXAMPLES_libxerces26-dev = $(l_PWD)/$(l_CLEAN_BUILD_DIR)/samples
DEB_INSTALL_DOCS_libxerces26-doc = \
@@ -142,9 +142,9 @@
# directory. The documentation package only depends upon the initial
# extracted source tree which doesn't need any special configuration.
-configure/libxerces26 configure/libxerces26-dev:: $(l_STAMPS)/configure/$(l_NATIVE_BUILD)
+configure/libxerces26c2 configure/libxerces26-dev:: $(l_STAMPS)/configure/$(l_NATIVE_BUILD)
-configure/libxercesicu26:: $(l_STAMPS)/configure/$(l_ICU_BUILD)
+configure/libxercesicu26c2:: $(l_STAMPS)/configure/$(l_ICU_BUILD)
# Build rules again using stamps
@@ -158,9 +158,9 @@
$(MAKE) -C $(l_ICU_BUILD_DIR)/src/xercesc
$(l_makestamp)
-build/libxerces26:: $(l_STAMPS)/build/$(l_NATIVE_BUILD)
+build/libxerces26c2:: $(l_STAMPS)/build/$(l_NATIVE_BUILD)
-build/libxercesicu26:: $(l_STAMPS)/build/$(l_ICU_BUILD)
+build/libxercesicu26c2:: $(l_STAMPS)/build/$(l_ICU_BUILD)
# The xerces install target installs development files as well as
# shared libraries, and it doesn't necessarily install the right
@@ -206,8 +206,8 @@
$(l_INSTALL)/$(cdbs_curpkg)/usr/lib/$(l_SHORTSONAME2)
endef
-install/libxerces26::
+install/libxerces26c2::
$(subst __BUILD_DIR__,$(l_NATIVE_BUILD_DIR),$(l_install_libs))
-install/libxercesicu26::
+install/libxercesicu26c2::
$(subst __BUILD_DIR__,$(l_ICU_BUILD_DIR),$(l_install_libs))