diff options
| author | Mike Hommey <mh@glandium.org> | 2004-10-16 07:29:42 +0000 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2004-10-16 07:29:42 +0000 |
| commit | c9367e0636257eba82e8d408e692152b84b190b8 (patch) | |
| tree | 46ec0b2c56e9af52250132b61b4d9863d14f1160 | |
| parent | f6d527b359792c8e88864a9d170f45b2bcc4503c (diff) | |
| download | libxml2-c9367e0636257eba82e8d408e692152b84b190b8.tar.gz | |
Merge last changes to 2.6.11-4 into trunkdebian/2.6.14-1
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index c394867..552bf30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ libxml2 (2.6.14-1) experimental; urgency=low 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 @@ libxml2 (2.6.11-4) unstable; urgency=low * 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 diff --git a/debian/control b/debian/control index d52a4da..39b3cc4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: libs 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 diff --git a/debian/rules b/debian/rules index 6c8b699..b849189 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,6 @@ else 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 @@ build-stamp: 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 |