[xml/sgml-commit] r292 - packages/libxml2/trunk/debian

[Mike Hommey]

Author: glandium-guest
Date: 2004-10-16 01:29:42 -0600 (Sat, 16 Oct 2004)
New Revision: 292

Modified:
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/control
   packages/libxml2/trunk/debian/rules
Log:
Merge last changes to 2.6.11-4 into trunk

Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2004-10-16 07:22:29 UTC (rev 291)
+++ packages/libxml2/trunk/debian/changelog	2004-10-16 07:29:42 UTC (rev 292)
@@ -5,7 +5,7 @@
     2.6.14 introduces some new symbols.
   * debian/shlibs.local: Removed, since it is not useful any more.
 
- -- Mike Hommey <mh@glandium.org>  Sat, 16 Oct 2004 16:12:12 +0900
+ -- Mike Hommey <mh@glandium.org>  Sat, 16 Oct 2004 16:29:06 +0900
 
 libxml2 (2.6.11-4) unstable; urgency=low
 
@@ -38,8 +38,10 @@
   * xmlIO.c: Fixed typo (Closes: #265740).
   * nanohttp.c, nanoftp.c: no_proxy environment variable doesn't disable proxy
     anymore. (Closes: #266430)
+  * debian/rules, debian/control: Removed the workaround to compile with
+    gcc-3.2 on hppa, since $254549 is closed.
 
- -- Mike Hommey <mh@glandium.org>  Sat, 16 Oct 2004 15:38:20 +0900
+ -- Mike Hommey <mh@glandium.org>  Sat, 16 Oct 2004 16:20:54 +0900
 
 libxml2 (2.6.11-3) unstable; urgency=low
 

Modified: packages/libxml2/trunk/debian/control
===================================================================
--- packages/libxml2/trunk/debian/control	2004-10-16 07:22:29 UTC (rev 291)
+++ packages/libxml2/trunk/debian/control	2004-10-16 07:29:42 UTC (rev 292)
@@ -4,7 +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.0.0), zlib1g-dev | libz-dev, python2.3-dev, autotools-dev, gcc-3.2 [hppa]
+Build-Depends: debhelper (>= 4.0.0), zlib1g-dev | libz-dev, python2.3-dev, autotools-dev
 
 Package: libxml2
 Architecture: any

Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules	2004-10-16 07:22:29 UTC (rev 291)
+++ packages/libxml2/trunk/debian/rules	2004-10-16 07:29:42 UTC (rev 292)
@@ -14,10 +14,6 @@
       CFLAGS += -O2
 endif
 
-ifeq (hppa,$(shell dpkg --print-architecture))
-	FORCEGCC := CC=gcc-3.2
-endif
-
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -28,7 +24,7 @@
 	done
 
 	# ./configure
-	$(FORCEGCC) CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-python=/usr/bin/python2.3
+	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-python=/usr/bin/python2.3
 	echo "all:" > example/Makefile
 	echo "install:" >> example/Makefile
 	echo "distclean:" >> example/Makefile