Hi, attached is the patch for the version of libxml++2.6 I intend to
upload, applied to
http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.14/libxml++-2.14.0.tar.gz.
Also attached is the delta between just the debian/ subdirs.
Since this fixes an RC bug and blocks one of my packages, please respond
right away if you don't want this NMU to happen or you think it might
cause a problem.
Thanks,
Brad
--- libxml++2.6-2.14.0.orig/docs/manual/Makefile.am
+++ libxml++2.6-2.14.0/docs/manual/Makefile.am
@@ -65,7 +65,7 @@
all-local: $(srcdir)/html/index.html
-clean-local:
+maintainer-clean-local:
-rm -rf $(srcdir)/html
-rm -f $(srcdir)/libxml++.dvi $(srcdir)/libxml++.ps $(srcdir)/libxml++.pdf $(srcdir)/libxml++-html.tar.gz
--- libxml++2.6-2.14.0.orig/docs/manual/Makefile.in
+++ libxml++2.6-2.14.0/docs/manual/Makefile.in
@@ -278,7 +278,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -304,7 +304,7 @@
maintainer-clean: maintainer-clean-am
-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-local
mostlyclean: mostlyclean-am
@@ -321,13 +321,13 @@
uninstall-am: uninstall-info-am uninstall-local
.PHONY: all all-am all-local check check-am clean clean-generic \
- clean-libtool clean-local distclean distclean-generic \
+ clean-libtool distclean distclean-generic \
distclean-libtool distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
install-data-local install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
+ maintainer-clean-generic maintainer-clean-local mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am uninstall-local
--- libxml++2.6-2.14.0.orig/debian/changelog
+++ libxml++2.6-2.14.0/debian/changelog
@@ -0,0 +1,45 @@
+libxml++2.6 (2.14.0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Medium-urgency upload for RC bugfix.
+ * New upstream release with new soname (Closes: #330512, #349630, #315967)
+ * No longer build reference documentation, since it's included in tarball.
+ * Fix makefile so that docs/manual/html isn't deleted on clean.
+
+ -- Bradley Bell <[EMAIL PROTECTED]> Sat, 10 Jun 2006 00:32:25 -0700
+
+libxml++2.6 (2.6.1-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Change package name from libxml++2.6-1c2 to libxml++2.6-1c2a for the C++
+ mt allocator ABI change, and conflict/replace libxml++2.6-1c2
+ accordingly. Closes: #339226.
+ * Build-depend on libglibmm-2.4-dev (>= 2.8.2-1), to make sure we get
+ the matching ABI.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Wed, 30 Nov 2005 05:54:52 -0800
+
+libxml++2.6 (2.6.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * C++ ABI transition
+ * Added library SONAME to the runtime library package's name
+
+ -- Philipp Kern <[EMAIL PROTECTED]> Sun, 17 Jul 2005 12:09:53 +0000
+
+libxml++2.6 (2.6.1-2) unstable; urgency=low
+
+ * Moved doc-base to libxml++2.6 (closes: Bug#258985)
+
+ -- Chris Leishman <[EMAIL PROTECTED]> Tue, 10 Aug 2004 17:27:06 +1000
+
+libxml++2.6 (2.6.1-1) unstable; urgency=low
+
+ * Initial 2.6 Release.
+
+ -- Chris Leishman <[EMAIL PROTECTED]> Sun, 10 Sep 2000 17:38:04 +1100
+
+Local variables:
+mode: debian-changelog
+End:
--- libxml++2.6-2.14.0.orig/debian/compat
+++ libxml++2.6-2.14.0/debian/compat
@@ -0,0 +1 @@
+4
--- libxml++2.6-2.14.0.orig/debian/copyright
+++ libxml++2.6-2.14.0/debian/copyright
@@ -0,0 +1,10 @@
+This package was debianized by Chris Leishman <[EMAIL PROTECTED]>.
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.6/
+
+Upstream Author: Christophe de Vienne <[EMAIL PROTECTED]>
+
+Copyright:
+
+Licensed under the GNU Lesser General Public License, which can be found in
+/usr/share/common-licenses/LGPL
--- libxml++2.6-2.14.0.orig/debian/libxml++2.6-dev.docs
+++ libxml++2.6-2.14.0/debian/libxml++2.6-dev.docs
@@ -0,0 +1,3 @@
+README
+NEWS
+AUTHORS
--- libxml++2.6-2.14.0.orig/debian/libxml++2.6-dev.install
+++ libxml++2.6-2.14.0/debian/libxml++2.6-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/libxml++-2.6/
+debian/tmp/usr/lib/libxml++-2.6.a
+debian/tmp/usr/lib/libxml++-2.6.la
+debian/tmp/usr/lib/libxml++-2.6.so
+debian/tmp/usr/lib/pkgconfig/
--- libxml++2.6-2.14.0.orig/debian/libxml++2.6-doc.doc-base
+++ libxml++2.6-2.14.0/debian/libxml++2.6-doc.doc-base
@@ -0,0 +1,13 @@
+Document: libxml++2.6
+Title: Debian libxml++ 2.6 Manual
+Author: Christophe de Vienne <[EMAIL PROTECTED]>
+Abstract: Libxml++ is a C++ interface to the GNOME XML library (libxml2)
+ This is a C++ interface to the GNOME XML library (version 2).
+ .
+ This is the API documentation generated automatically from the libxml++ source
+ by doxygen.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libxml++2.6-doc/html/index.html
+Files: /usr/share/doc/libxml++2.6-doc/html/*.html
--- libxml++2.6-2.14.0.orig/debian/libxml++2.6-doc.docs
+++ libxml++2.6-2.14.0/debian/libxml++2.6-doc.docs
@@ -0,0 +1,2 @@
+docs/reference/2.14/html
+docs/reference/libxml++_doxygen_tags
--- libxml++2.6-2.14.0.orig/debian/libxml++2.6-doc.examples
+++ libxml++2.6-2.14.0/debian/libxml++2.6-doc.examples
@@ -0,0 +1 @@
+examples.dist/*
--- libxml++2.6-2.14.0.orig/debian/rules
+++ libxml++2.6-2.14.0/debian/rules
@@ -0,0 +1,157 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_BUILD_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+
+config.status: configure
+ dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ mv config.sub config.sub.dist
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ mv config.guess config.guess.dist
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ touch configure.in && \
+ touch aclocal.m4 && \
+ touch acinclude.m4 && \
+ touch ltmain.sh && \
+ touch configure
+ find . -name 'Makefile.am' | xargs touch
+ find . -name 'Makefile.in' | xargs touch
+ ./configure $(confflags) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info
+
+
+#build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: config.status
+ dh_testdir
+# $(MAKE) -C docs/reference
+ touch build-indep-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp
+
+ -$(MAKE) distclean
+# rm -rf docs/reference/1.0
+# rm -f docs/reference/libxml++_doxygen_tags
+
+ @if test -e config.sub.dist; then \
+ rm -f config.sub; \
+ mv config.sub.dist config.sub; \
+ fi
+ @if test -e config.guess.dist; then \
+ rm -f config.guess; \
+ mv config.guess.dist config.guess; \
+ fi
+
+ dh_clean
+ rm -rf examples.dist
+
+install: install-indep install-arch
+
+install-arch: build-arch
+ dh_testdir
+ dh_testroot
+ dh_clean -k -a
+ dh_installdirs -a
+
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ dh_install -a --list-missing
+
+install-indep: build-indep
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ find examples -type d -a ! -name CVS -a ! -name '.*' | \
+ sed -e 's/^examples/examples.dist/' | xargs install -d
+ for file in `find examples ! -type d -a ! -path '*/CVS*' -a ! -path '*/.*' -a ! -name '.*' -a ! -name 'Makefile*'`; do \
+ target=`dirname $$file | sed -e 's/^examples/examples.dist/'`; \
+ install -m0644 $$file $$target; \
+ done
+
+ dh_install -i --list-missing
+
+
+# Common target for binary-indep/binary-arch. Must not depend on anything and
+# will get called by another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress -Xdoxygen_tags
+ dh_fixperms
+# dh_perl
+# dh_python
+ dh_makeshlibs
+ dh_shlibdeps
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+
+# Build architecture-independent files using the common target.
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture-dependent files using the common target.
+binary-arch: install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+.PHONY: build clean install install-indep install-arch install binary binary-common binary-indep binary-arch
--- libxml++2.6-2.14.0.orig/debian/control
+++ libxml++2.6-2.14.0/debian/control
@@ -0,0 +1,43 @@
+Source: libxml++2.6
+Priority: optional
+Section: devel
+Maintainer: Chris Leishman <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 4.0.0), libxml2-dev (>= 2.6.1), libglibmm-2.4-dev (>= 2.8.2-1), autotools-dev, pkg-config
+Standards-Version: 3.6.2
+
+Package: libxml++2.6-dev
+Section: libdevel
+Architecture: any
+Depends: libxml++2.6-2 (= ${Source-Version}), libc6-dev, libxml2-dev (>= 2.6.1), libglibmm-2.4-dev, libstdc++-dev, pkg-config
+Suggests: libxml++2.6-doc
+Description: A C++ interface to the GNOME XML library (libxml2)
+ libxml++ is a C++ wrapper for the libxml2 XML parser library (otherwise
+ known as the GNOME2 XML library). It has SAX and DOM-like APIs, but does not
+ attempt to conform exactly to the DOM specification because they are not
+ aimed at C++. Its API is much simpler than the underlying libxml C API.
+ .
+ Install this package if you with to develop your own programs using this
+ library.
+
+Package: libxml++2.6-2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: A C++ interface to the GNOME XML library (libxml2)
+ libxml++ is a C++ wrapper for the libxml2 XML parser library (otherwise
+ known as the GNOME2 XML library).
+ .
+ homepage: http://libxmlplusplus.sourceforge.net/
+
+Package: libxml++2.6-doc
+Section: doc
+Architecture: all
+Suggests: libxml++2.6-dev, doc-base
+Description: HTML interface documentation and examples for libxml++
+ libxml++ is a C++ wrapper for the libxml2 XML parser library (otherwise
+ known as the GNOME2 XML library). It has SAX and DOM-like APIs, but does not
+ attempt to conform exactly to the DOM specification because they are not
+ aimed at C++. Its API is much simpler than the underlying libxml C API.
+ .
+ This package contains HTML interface documentation generated from the
+ libxml++ source, as well as examples of libxml++ use.
--- libxml++2.6-2.14.0.orig/debian/libxml++2.6-2.install
+++ libxml++2.6-2.14.0/debian/libxml++2.6-2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libxml++-2.6.so.*
diff -ruN libxml++2.6-2.6.1/debian/changelog libxml++2.6-2.14.0/debian/changelog
--- libxml++2.6-2.6.1/debian/changelog 2006-06-10 01:31:31.000000000 -0700
+++ libxml++2.6-2.14.0/debian/changelog 2006-06-10 01:48:23.000000000 -0700
@@ -1,3 +1,15 @@
+libxml++2.6 (2.14.0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Medium-urgency upload for RC bugfix.
+ * New upstream release with new soname (Closes: #330512, #349630, #315967)
+ * No longer build reference documentation, since it's included in tarball.
+ * Adjust makefiles so that docs/manual/html isn't deleted on clean.
+ * Rename config.* to config.*.dist instead of to config.*.orig so dh_clean
+ does not erase them
+
+ -- Bradley Bell <[EMAIL PROTECTED]> Sat, 10 Jun 2006 01:46:54 -0700
+
libxml++2.6 (2.6.1-2.2) unstable; urgency=medium
* Non-maintainer upload.
diff -ruN libxml++2.6-2.6.1/debian/control libxml++2.6-2.14.0/debian/control
--- libxml++2.6-2.6.1/debian/control 2006-06-10 01:31:31.000000000 -0700
+++ libxml++2.6-2.14.0/debian/control 2006-06-10 01:31:40.000000000 -0700
@@ -3,13 +3,12 @@
Section: devel
Maintainer: Chris Leishman <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), libxml2-dev (>= 2.6.1), libglibmm-2.4-dev
(>= 2.8.2-1), autotools-dev, pkg-config
-Build-Depends-Indep: doxygen
Standards-Version: 3.6.2
Package: libxml++2.6-dev
Section: libdevel
Architecture: any
-Depends: libxml++2.6-1c2a (= ${Source-Version}), libc6-dev, libxml2-dev (>=
2.6.1), libglibmm-2.4-dev, libstdc++-dev, pkg-config
+Depends: libxml++2.6-2 (= ${Source-Version}), libc6-dev, libxml2-dev (>=
2.6.1), libglibmm-2.4-dev, libstdc++-dev, pkg-config
Suggests: libxml++2.6-doc
Description: A C++ interface to the GNOME XML library (libxml2)
libxml++ is a C++ wrapper for the libxml2 XML parser library (otherwise
@@ -20,12 +19,10 @@
Install this package if you with to develop your own programs using this
library.
-Package: libxml++2.6-1c2a
+Package: libxml++2.6-2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libxml++2.6, libxml++2.6-1c2
-Replaces: libxml++2.6, libxml++2.6-1c2
Description: A C++ interface to the GNOME XML library (libxml2)
libxml++ is a C++ wrapper for the libxml2 XML parser library (otherwise
known as the GNOME2 XML library).
diff -ruN libxml++2.6-2.6.1/debian/libxml++2.6-1c2a.install
libxml++2.6-2.14.0/debian/libxml++2.6-1c2a.install
--- libxml++2.6-2.6.1/debian/libxml++2.6-1c2a.install 2006-06-10
01:31:31.000000000 -0700
+++ libxml++2.6-2.14.0/debian/libxml++2.6-1c2a.install 1969-12-31
16:00:00.000000000 -0800
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libxml++-2.6.so.*
diff -ruN libxml++2.6-2.6.1/debian/libxml++2.6-2.install
libxml++2.6-2.14.0/debian/libxml++2.6-2.install
--- libxml++2.6-2.6.1/debian/libxml++2.6-2.install 1969-12-31
16:00:00.000000000 -0800
+++ libxml++2.6-2.14.0/debian/libxml++2.6-2.install 2006-06-10
01:31:40.000000000 -0700
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libxml++-2.6.so.*
diff -ruN libxml++2.6-2.6.1/debian/libxml++2.6-doc.docs
libxml++2.6-2.14.0/debian/libxml++2.6-doc.docs
--- libxml++2.6-2.6.1/debian/libxml++2.6-doc.docs 2006-06-10
01:31:31.000000000 -0700
+++ libxml++2.6-2.14.0/debian/libxml++2.6-doc.docs 2006-06-10
01:31:40.000000000 -0700
@@ -1,2 +1,2 @@
-docs/reference/2.6/html
+docs/reference/2.14/html
docs/reference/libxml++_doxygen_tags
diff -ruN libxml++2.6-2.6.1/debian/rules libxml++2.6-2.14.0/debian/rules
--- libxml++2.6-2.6.1/debian/rules 2006-06-10 01:31:31.000000000 -0700
+++ libxml++2.6-2.14.0/debian/rules 2006-06-10 01:31:40.000000000 -0700
@@ -61,7 +61,7 @@
build-indep: build-indep-stamp
build-indep-stamp: config.status
dh_testdir
- $(MAKE) -C docs/reference
+# $(MAKE) -C docs/reference
touch build-indep-stamp
clean:
@@ -70,8 +70,8 @@
rm -f build-arch-stamp build-indep-stamp
-$(MAKE) distclean
- rm -rf docs/reference/1.0
- rm -f docs/reference/libxml++_doxygen_tags
+# rm -rf docs/reference/1.0
+# rm -f docs/reference/libxml++_doxygen_tags
@if test -e config.sub.orig; then \
rm -f config.sub; \
