[xml/sgml-commit] r336 - in packages/libxml/trunk: . debian

[Mike Hommey]

Author: glandium-guest
Date: 2004-11-22 08:14:36 -0700 (Mon, 22 Nov 2004)
New Revision: 336

Modified:
   packages/libxml/trunk/debian/changelog
   packages/libxml/trunk/debian/control
   packages/libxml/trunk/debian/libxml-dev.preinst
   packages/libxml/trunk/debian/rules
   packages/libxml/trunk/entities.h
Log:
debian/control: Put build-depends on one line.
debian/rules: Remove loop link /usr/include/gnome-xml/libxml and change it into a directory containing links to the header files. Closes: #130184.
libxml-dev.preinst: Remove old /usr/include/gnome-xml/libxml on upgrade.
entities.h: Removed redeclaration of xmlCopyEntitiesTable. Closes: #279328.


Modified: packages/libxml/trunk/debian/changelog
===================================================================
--- packages/libxml/trunk/debian/changelog	2004-11-21 15:52:29 UTC (rev 335)
+++ packages/libxml/trunk/debian/changelog	2004-11-22 15:14:36 UTC (rev 336)
@@ -2,8 +2,13 @@
 
   * debian/libxml-dev.install, debian/libxml1.install: Moved .pc file into
     libxml-dev package. Closes: #281580.
+  * debian/control: Put build-depends on one line.
+  * debian/rules: Remove loop link /usr/include/gnome-xml/libxml and change it
+    into a directory containing links to the header files. Closes: #130184.
+  * libxml-dev.preinst: Remove old /usr/include/gnome-xml/libxml on upgrade.
+  * entities.h: Removed redeclaration of xmlCopyEntitiesTable. Closes: #279328.
 
- -- Mike Hommey <mh@glandium.org>  Sun, 21 Nov 2004 18:45:47 +0900
+ -- Mike Hommey <mh@glandium.org>  Mon, 22 Nov 2004 23:46:25 +0900
 
 libxml (1:1.8.17-9) unstable; urgency=high
 

Modified: packages/libxml/trunk/debian/control
===================================================================
--- packages/libxml/trunk/debian/control	2004-11-21 15:52:29 UTC (rev 335)
+++ packages/libxml/trunk/debian/control	2004-11-22 15:14:36 UTC (rev 336)
@@ -4,8 +4,7 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
 Uploaders: Mike Hommey <mh@glandium.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4), zlib1g-dev | libz-dev, libncurses5-dev,
-               libreadline4-dev, autotools-dev
+Build-Depends: debhelper (>= 4), zlib1g-dev | libz-dev, libncurses5-dev, libreadline4-dev, autotools-dev
 
 Package: libxml1
 Architecture: any

Modified: packages/libxml/trunk/debian/libxml-dev.preinst
===================================================================
--- packages/libxml/trunk/debian/libxml-dev.preinst	2004-11-21 15:52:29 UTC (rev 335)
+++ packages/libxml/trunk/debian/libxml-dev.preinst	2004-11-22 15:14:36 UTC (rev 336)
@@ -4,4 +4,8 @@
   rm -rf /usr/doc/libxml-dev
 fi
 
+if [ -L /usr/include/gnome-xml/libxml ]; then
+  rm -f /usr/include/gnome-xml/libxml
+fi
+
 #DEBHELPER#

Modified: packages/libxml/trunk/debian/rules
===================================================================
--- packages/libxml/trunk/debian/rules	2004-11-21 15:52:29 UTC (rev 335)
+++ packages/libxml/trunk/debian/rules	2004-11-22 15:14:36 UTC (rev 336)
@@ -51,6 +51,15 @@
 	$(MAKE) prefix=`pwd`/debian/tmp/usr install
 	cd debian/tmp/usr/lib && ln -s libxml.so.1 libxml.so.0
 	rm -rf debian/tmp/usr/share/gnome-xml
+	rm -f debian/tmp/usr/include/gnome-xml/libxml
+	install -d -m 755 debian/tmp/usr/include/gnome-xml/libxml
+	ls -l debian/tmp/usr/include/gnome-xml
+	cd debian/tmp/usr/include/gnome-xml && \
+	for file in *.h; do \
+	  ln -sf ../$${file} libxml/$${file}; \
+	done
+	ls -l debian/tmp/usr/include/gnome-xml
+	ls -l debian/tmp/usr/include/gnome-xml/libxml
 
 	touch install-stamp
 

Modified: packages/libxml/trunk/entities.h
===================================================================
--- packages/libxml/trunk/entities.h	2004-11-21 15:52:29 UTC (rev 335)
+++ packages/libxml/trunk/entities.h	2004-11-22 15:14:36 UTC (rev 336)
@@ -92,7 +92,6 @@
 void			xmlFreeEntitiesTable	(xmlEntitiesTablePtr table);
 void			xmlDumpEntitiesTable	(xmlBufferPtr buf,
 						 xmlEntitiesTablePtr table);
-xmlEntitiesTablePtr	xmlCopyEntitiesTable	(xmlEntitiesTablePtr table);
 void			xmlCleanupPredefinedEntities(void);
 
 #ifdef __cplusplus