[pkg-boost-commits] r13890 - boost/trunk/debian

[Domenico Andreoli]

Author: cavok
Date: 2005-11-20 23:09:52 +0000 (Sun, 20 Nov 2005)
New Revision: 13890

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
libicu34-dev is now available also on m68k

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2005-11-19 15:01:01 UTC (rev 13889)
+++ boost/trunk/debian/changelog	2005-11-20 23:09:52 UTC (rev 13890)
@@ -1,7 +1,5 @@
 boost (1.33.0-4) unstable; urgency=low
 
-  * debian/control, debian/rules: ICU support is now disabled on m68k.
-
   * debian/control: renamed DSO packages to '*c2a'.  Closes: #339154.
 
  -- Domenico Andreoli <cavok at debian.org>  Sat, 19 Nov 2005 15:55:50 +0100

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2005-11-19 15:01:01 UTC (rev 13889)
+++ boost/trunk/debian/control	2005-11-20 23:09:52 UTC (rev 13890)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Boost Team <pkg-boost-devel at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>, Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 4), bison, flex, docbook-to-man, xsltproc, doxygen, python2.3-dev, zlib1g-dev, libbz2-dev, libicu34-dev [!m68k], gcc-3.4 [hppa], gcc-3.4 [m68k], g++-3.4 [hppa], g++-3.4 [m68k]
+Build-Depends: debhelper (>= 4), bison, flex, docbook-to-man, xsltproc, doxygen, python2.3-dev, zlib1g-dev, libbz2-dev, libicu34-dev, gcc-3.4 [hppa], gcc-3.4 [m68k], g++-3.4 [hppa], g++-3.4 [m68k]
 Standards-Version: 3.6.2
 
 Package: bcp

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2005-11-19 15:01:01 UTC (rev 13889)
+++ boost/trunk/debian/rules	2005-11-20 23:09:52 UTC (rev 13890)
@@ -37,11 +37,6 @@
 endif
 endif
 
-HAVE_ICU=
-ifneq ($(DEB_BUILD_ARCH), m68k)
-HAVE_ICU=-sHAVE_ICU=1
-endif
-
 exampledir = debian/libboost-doc/usr/share/doc/libboost-doc/examples
 htmldir = debian/libboost-doc/usr/share/doc/libboost-doc/HTML
 
@@ -51,7 +46,7 @@
 	-sTOOLS=gcc \
 	-sGCC=$(GCC) \
 	-sGXX=$(GXX) \
-	$(HAVE_ICU) \
+	-sHAVE_ICU=1 \
 	-sPYTHON_VERSION=2.3 \
 	-sPYTHON_ROOT=/usr