Here's a patch.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)
diff -Nur icu-3.6.old/debian/control icu-3.6/debian/control
--- icu-3.6.old/debian/control	2007-08-29 16:53:49.000000000 +0200
+++ icu-3.6/debian/control	2007-08-31 16:53:31.000000000 +0200
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}
 Replaces: icu, icu-locales
 Conflicts: icu, icu-locales
-Description: International Components for Unicode (libraries)
+Description: International Components for Unicode
  ICU is a C++ and C library that provides robust and full-featured
  Unicode and locale support.  This package contains the runtime
  libraries for ICU.
@@ -24,7 +24,29 @@
 Replaces: libicu21-dev, libicu28-dev, icu-data, icu-i18ndata, libicu34-dev
 Conflicts: libicu21-dev, libicu28-dev, libicu-dev, icu-data, icu-i18ndata, libicu34-dev
 Suggests: icu-doc
-Description: International Components for Unicode (development files)
+Description: Development files for International Components for Unicode
+ ICU is a C++ and C library that provides robust and full-featured
+ Unicode and locale support.  This package contains the development
+ files for ICU along with programs used to manipulate data files found
+ in the ICU sources.
+
+Package: lib32icu36
+Section: libs
+Architecture: amd64 ppc64
+Depends: ${shlibs:Depends}
+Description: International Components for Unicode (32-bit)
+ ICU is a C++ and C library that provides robust and full-featured
+ Unicode and locale support.  This package contains the runtime
+ libraries for ICU.
+
+Package: lib32icu36-dev
+Section: libdevel
+Architecture: amd64 ppc64
+Depends: libicu36-dev (= ${Source-Version}), lib32icu36 (= ${Source-Version})
+Provides: lib32icu-dev
+Conflicts: lib32icu-dev
+Suggests: icu-doc
+Description: Development files for International Components for Unicode (32-bit)
  ICU is a C++ and C library that provides robust and full-featured
  Unicode and locale support.  This package contains the development
  files for ICU along with programs used to manipulate data files found
diff -Nur icu-3.6.old/debian/lib32icu36-dev.install icu-3.6/debian/lib32icu36-dev.install
--- icu-3.6.old/debian/lib32icu36-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ icu-3.6/debian/lib32icu36-dev.install	2007-08-31 17:34:49.000000000 +0200
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib32/lib*.so
+debian/tmp/usr/lib32/lib*.a
+debian/tmp/usr/lib32/icu
diff -Nur icu-3.6.old/debian/lib32icu36.install icu-3.6/debian/lib32icu36.install
--- icu-3.6.old/debian/lib32icu36.install	1970-01-01 01:00:00.000000000 +0100
+++ icu-3.6/debian/lib32icu36.install	2007-08-31 17:34:05.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib32/lib*.so.*
diff -Nur icu-3.6.old/debian/rules icu-3.6/debian/rules
--- icu-3.6.old/debian/rules	2007-08-29 16:53:49.000000000 +0200
+++ icu-3.6/debian/rules	2007-08-31 17:07:41.000000000 +0200
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
 # To distinguish variables that are truly local to this file (rather
 # than for use by cdbs), we adopt the convention of starting local
 # variables' names with l_.
@@ -7,6 +9,24 @@
 l_PWD := $(shell pwd)
 l_STAMPS := debian/l_stamps
 l_RUN_CHECK := 1
+l_CFLAGS := -g -Wall
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	l_CFLAGS += -O0
+else
+	l_CFLAGS += -O2
+endif
+# common configure cruft
+l_CONFIGURE = CC="gcc" CXX="g++" CPPFLAGS="" LDFLAGS="" \
+	./configure \
+	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --includedir="\$${prefix}/include" \
+	--mandir="\$${prefix}/share/man" --infodir="\$${prefix}/share/info" --sysconfdir=/etc --localstatedir=/var \
+	--disable-maintainer-mode --disable-dependency-tracking
+# specific to this package
+l_CONFIGURE += --disable-samples --enable-static
+
+ifneq (, $(filter $(DEB_HOST_ARCH_CPU), amd64 ppc64))
+build32 := build32
+endif
 
 # Variables used by cdbs
 
@@ -14,7 +34,6 @@
              awk '/Version:/ {print $$2}' | cut -d- -f 1)
 
 DEB_TAR_SRCDIR = icu/source
-DEB_CONFIGURE_USER_FLAGS = --disable-samples --enable-static
 DEB_COMPRESS_EXCLUDE = html examples
 DEB_INSTALL_EXAMPLES_libicu36-dev = \
 	build-tree/$(DEB_TAR_SRCDIR)/samples/*
@@ -22,9 +41,6 @@
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_MAKE_INSTALL_TARGET += install-doc
 
 cleanbuilddir::
 	$(RM) -r $(l_STAMPS)
@@ -34,6 +50,34 @@
 clean::
 	$(RM) debian/compat *.cdbs-config_list
 
+pre-build::
+	chmod a+x $(DEB_SRCDIR)/configure
+	cp -a $(DEB_SRCDIR) $(DEB_SRCDIR)-build
+ifneq (, $(build32))
+	cp -a $(DEB_SRCDIR) $(DEB_SRCDIR)-build32
+endif
+
+configure/libicu36 configure/libicu36-dev::
+	cd $(DEB_SRCDIR)-build && CFLAGS="$(l_CFLAGS)" CXXFLAGS="$(l_CFLAGS)" $(l_CONFIGURE)
+
+configure/lib32icu36 configure/lib32icu36-dev::
+	cd $(DEB_SRCDIR)-build32 && CFLAGS="$(l_CFLAGS) -m32" CXXFLAGS="$(l_CFLAGS) -m32" $(l_CONFIGURE) --libdir=/usr/lib32
+
+build/libicu36 build/libicu36-dev::
+	$(MAKE) -C $(DEB_SRCDIR)-build
+
+build/lib32icu36 build/lib32icu36-dev::
+	$(MAKE) -C $(DEB_SRCDIR)-build32
+
+install/libicu36 install/libicu36-dev::
+	$(MAKE) -C $(DEB_SRCDIR)-build install DESTDIR=$(CURDIR)/debian/tmp
+
+install/lib32icu36 install/lib32icu36-dev::
+	$(MAKE) -C $(DEB_SRCDIR)-build32 install DESTDIR=$(CURDIR)/debian/tmp
+
+install/icu-doc:: install/libicu36 install/libicu36-dev
+	$(MAKE) -C $(DEB_SRCDIR)-build install-doc DESTDIR=$(CURDIR)/debian/tmp
+
 # As per upstream, icuswap is deprecated and should not be
 # distributed.
 binary-post-install/libicu36-dev::

Reply via email to