diff -rupN xml-core-0.13/debhelper/dh_installxmlcatalogs xml-core-0.14/debhelper/dh_installxmlcatalogs
--- xml-core-0.13/debhelper/dh_installxmlcatalogs	2008-10-14 08:36:31.000000000 -0400
+++ xml-core-0.14/debhelper/dh_installxmlcatalogs	2012-03-13 20:22:14.447994843 -0400
@@ -277,11 +277,6 @@ foreach my $package (@{$dh{DOPACKAGES}})
 			addsubstvar( $package,
 				     "misc:Depends", "xml-core", ">= $xmlcorever" );
 
-			# Make sure /etc/xml exists (see http://bugs.debian.org/411770).
-			if (! -d "$tmpdir/etc/xml") {
-				doit("install","-d","-m755","$tmpdir/etc/xml");
-			}
-
 		}
 	}
 }
diff -rupN xml-core-0.13/debhelper/postinst-xmlcatalog xml-core-0.14/debhelper/postinst-xmlcatalog
--- xml-core-0.13/debhelper/postinst-xmlcatalog	2007-03-10 23:28:32.000000000 -0500
+++ xml-core-0.14/debhelper/postinst-xmlcatalog	2012-03-13 22:42:32.336000051 -0400
@@ -1,4 +1,11 @@
 if [ "$1" = "configure" ]; then
+
+# Make sure /etc/xml exists (see http://bugs.debian.org/411770).
+if [ ! -d /etc/xml ] ;
+then
+    install -d -m755 /etc/xml
+fi
+
 #ADD_PACKAGE#
 #ADD_ROOT#
 fi
diff -rupN xml-core-0.13/debhelper/postrm-xmlcatalog xml-core-0.14/debhelper/postrm-xmlcatalog
--- xml-core-0.13/debhelper/postrm-xmlcatalog	2007-03-10 23:28:32.000000000 -0500
+++ xml-core-0.14/debhelper/postrm-xmlcatalog	2012-03-13 22:44:46.035999765 -0400
@@ -1,3 +1,5 @@
 if [ "$1" = "purge" ]; then
 	rm -f #PACKAGECAT# #PACKAGECAT#.old
+
+	[ -d /etc/xml ] && rmdir --ignore-fail-on-non-empty /etc/xml
 fi
diff -rupN xml-core-0.13/debian/changelog xml-core-0.14/debian/changelog
--- xml-core-0.13/debian/changelog	2009-10-25 18:49:19.000000000 -0400
+++ xml-core-0.14/debian/changelog	2012-03-13 23:09:53.619998283 -0400
@@ -1,3 +1,12 @@
+xml-core (0.14) unstable; urgency=low
+
+  [ David Steele ]
+  * /etc/xml owned solely by xml-core (Closes: #611418)
+  * /etc/xml removed cleanly by packages using dh_installxmlcatalogs
+  * fixed build and lintian warnings
+
+ -- Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>  Mon, 12 Mar 2012 22:44:41 -0400
+
 xml-core (0.13) unstable; urgency=low
 
   * debian/control (Standards-Version): Bumped to 3.8.3.
diff -rupN xml-core-0.13/debian/control xml-core-0.14/debian/control
--- xml-core-0.13/debian/control	2009-10-25 18:49:07.000000000 -0400
+++ xml-core-0.14/debian/control	2012-03-13 22:50:56.844000365 -0400
@@ -5,7 +5,7 @@ Maintainer: Debian XML/SGML Group <debia
 Uploaders: Ardo van Rangelrooij <ardo@debian.org>, Daniel Leidert (dale) <daniel.leidert@wgdd.de>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: perl
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/
 Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xml-core/trunk/
 DM-Upload-Allowed: yes
diff -rupN xml-core-0.13/debian/rules xml-core-0.14/debian/rules
--- xml-core-0.13/debian/rules	2008-10-14 08:19:48.000000000 -0400
+++ xml-core-0.14/debian/rules	2012-03-13 22:58:06.120000100 -0400
@@ -31,7 +31,7 @@ install:	install-stamp
 install-stamp:	build
 		dh_testdir
 		dh_testroot
-		dh_clean -k
+		dh_prep
 		dh_installdirs
 		$(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE)/usr
 		touch install-stamp
@@ -59,6 +59,10 @@ binary-arch:
 
 binary:		binary-indep binary-arch
 
-.PHONY:		clean build install binary-indep binary-arch binary
+build-arch:	build
+
+build-indep:	build
+
+.PHONY:		clean build install binary-indep binary-arch binary build-arch build-indep
 
 ## ----------------------------------------------------------------------
diff -rupN xml-core-0.13/debian/source/format xml-core-0.14/debian/source/format
--- xml-core-0.13/debian/source/format	1969-12-31 19:00:00.000000000 -0500
+++ xml-core-0.14/debian/source/format	2012-03-13 23:01:25.196001437 -0400
@@ -0,0 +1 @@
+3.0 (native)
diff -rupN xml-core-0.13/debian/xml-core.postrm xml-core-0.14/debian/xml-core.postrm
--- xml-core-0.13/debian/xml-core.postrm	2007-04-16 13:17:47.000000000 -0400
+++ xml-core-0.14/debian/xml-core.postrm	2012-03-13 22:46:34.715998364 -0400
@@ -25,7 +25,7 @@ then
 
     ## ------------------------------------------------------------------
     ## remove /etc/xml
-    [ -d /var/lib/xml-core ] && rmdir --ignore-fail-on-non-empty /etc/xml
+    [ -d /etc/xml ] && rmdir --ignore-fail-on-non-empty /etc/xml
 
     ## ------------------------------------------------------------------
     ## restore legacy /etc/xml/catalog