From 3cf82ce3fff6e01a2aaa9a71af537f50638f1312 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Sun, 2 May 2004 06:57:35 +0000 Subject: [PATCH] ICU-3726 Add some Debian changes X-SVN-Rev: 15117 --- icu4c/debian/changelog | 42 ++++++++++++++++++++++++++++++++++ icu4c/debian/control | 11 +++++---- icu4c/debian/rules | 52 ++++++++++++++++++++++++------------------ 3 files changed, 78 insertions(+), 27 deletions(-) diff --git a/icu4c/debian/changelog b/icu4c/debian/changelog index 2c79240f82c..379ee4b7b8d 100644 --- a/icu4c/debian/changelog +++ b/icu4c/debian/changelog @@ -1,3 +1,45 @@ +icu (2.6.1-1) experimental; urgency=low + + * New upstream version. + * Ivo Timmermans: + * debian/rules Don't create arch-all packages in the binary-arch + target. Closes: #184403 + + -- Ivo Timmermans Thu, 6 Nov 2003 09:03:44 +0100 + +icu (2.6-1) experimental; urgency=low + + * New upstream version. Closes: #162975 + * debian/control: New maintainers + * Daniel Glassey: + * debian/rules Change the optimisations to -O3 and -O to get it to build + * debian/rules get the latest config.{sub,guess} from /usr/share/misc + so add build-dep on autotools-dev + * debian/postinst gencnval is now in {prefix}/bin + * Ivo Timmermans: + * debian/control Tightened debhelper build dependency + * debian/control Update Standards-Version + + -- Daniel Glassey Wed, 3 Sep 2003 12:39:35 +0200 + +icu (2.1-1.2) unstable; urgency=low + + * NMU. + * Updated source/config.{sub,guess}. Closes: #182697 + + -- Ivo Timmermans Fri, 7 Mar 2003 20:58:23 +0100 + +icu (2.1-1.1) unstable; urgency=low + + * NMU. + * debian/control: Go through G++ ABI transition. Closes: #180124 + * source/common/unicode/docmain.h: Fix \mainpage and \section tags, + so doxygen doesn't get confused any more. Closes: #178344 + * debian/copyright: Added upstream URL. Closes: #165780 + * + + -- Ivo Timmermans Fri, 14 Feb 2003 15:21:56 +0100 + icu (2.1-1) unstable; urgency=low * ICU 2.1 release. diff --git a/icu4c/debian/control b/icu4c/debian/control index 8b3e6ed2902..a183a62d463 100644 --- a/icu4c/debian/control +++ b/icu4c/debian/control @@ -1,11 +1,12 @@ Source: icu Section: libs Priority: optional -Maintainer: Yves Arrouye -Standards-Version: 3.5.6 -Build-Depends: debhelper, doxygen +Maintainer: Daniel Glassey +Uploaders: Ivo Timmermans +Standards-Version: 3.6.0 +Build-Depends: debhelper (>> 3.0), doxygen, autotools-dev -Package: libicu21-dev +Package: libicu30-dev Section: devel Architecture: any Depends: libicu${major} (= ${Source-Version}), libc6-dev @@ -24,7 +25,7 @@ Description: API documentation for ICU classes and functions and locale support. This package contains HTML files documenting the ICU APIs. -Package: libicu21 +Package: libicu30 Section: libs Architecture: any Depends: ${shlibs:Depends} diff --git a/icu4c/debian/rules b/icu4c/debian/rules index d0257e49848..fcbca82408e 100755 --- a/icu4c/debian/rules +++ b/icu4c/debian/rules @@ -47,11 +47,11 @@ endif # Build flags -CFLAGS = -O2 # -Wall +CFLAGS = -O3 # -Wall ifeq ($(shell uname -m),s390) CXXFLAGS = -O1 # -Wall else -CXXFLAGS = -O2 # -Wall +CXXFLAGS = -O # -Wall endif INSTALL_PROGRAM = /usr/bin/install @@ -70,7 +70,7 @@ configure: $(builddir)/configure-stamp $(builddir)/configure-stamp: # Add here commands to configure the package. test -d $(builddir) || mkdir $(builddir) - cd $(builddir); CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(SHELL) $(builddir_relative_srcdir)/configure --srcdir=$(builddir_relative_srcdir) --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc --localstatedir=/var --with-data-packaging=files --disable-rpath --enable-shared --enable-static --disable-samples + cd $(builddir); CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(SHELL) $(builddir_relative_srcdir)/configure --srcdir=$(builddir_relative_srcdir) --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc --localstatedir=/var --with-data-packaging=files --enable-shared --enable-static --disable-samples touch $@ build: $(builddir)/configure-stamp debian-files $(builddir)/build-stamp @@ -94,12 +94,18 @@ $(builddir)/build-stamp: # Add here commands to compile the package. $(MAKE) -C $(builddir) + $(MAKE) -C $(builddir) doc touch $@ clean: update-debian-files dh_testdir dh_testroot + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub $(srcdir)/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess $(srcdir)/config.guess + $(RM) $(builddir)/build-stamp $(builddir)/configure-stamp # Add here commands to clean up after the build process. @@ -120,6 +126,7 @@ install: build # Add here commands to install the package into debian/tmp $(MAKE) -C $(builddir) install DESTDIR=`pwd`/debian/tmp + $(MAKE) -C $(builddir) install-doc DESTDIR=`pwd`/debian/tmp # Build architecture-independent files here. binary-indep: build install @@ -163,7 +170,7 @@ binary-arch: build install # # massage data files # - $(RM) debian/tmp/$(iculibdir)/cnvalias.dat +# $(RM) debian/tmp/$(iculibdir)/cnvalias.dat ifneq ($(iculibdir),$(icufildir)) test -d debian/tmp/$(icufildir) || mkdir debian/tmp/$(icufildir) mv debian/tmp/$(iculibdir)/*.* debian/tmp/$(icufildir) @@ -178,11 +185,12 @@ ifneq ($(iculibdir),$(icufildir)) dh_movefiles -picu \ $(iculibdir)/*msg.dat endif + # The license.html must be installed with ICU's source code. + # This includes the headers. dh_movefiles -picu \ etc \ usr/bin \ usr/sbin \ - $(icudatadir)/README \ $(icudatadir)/license.html \ $(iculibdir)/*.inc \ $(icufildir)/*.cnv \ @@ -198,7 +206,7 @@ endif # move the rest of the development files # in their package # - dh_movefiles usr + dh_movefiles -a usr # # do a bit of cleanup # @@ -208,30 +216,30 @@ endif # continue to prepare packages # # dh_installdebconf - dh_installdocs - dh_installexamples $(srcdir)/samples/* + dh_installdocs -a + dh_installexamples -a $(srcdir)/samples/* find debian/libicu$(major)-dev -name CVS -o -name .cvsignore | xargs $(RM) -r - dh_installmenu + dh_installmenu -a # dh_installemacsen # dh_installpam # dh_installinit - dh_installcron + dh_installcron -a dh_installmanpages -picu - dh_installinfo + dh_installinfo -a # dh_undocumented -picu - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms + dh_installchangelogs -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a # You may want to make some executables suid here. - dh_makeshlibs - dh_installdeb + dh_makeshlibs -a + dh_installdeb -a # dh_perl - dh_shlibdeps -ldebian/libicu$(major)/usr/lib - dh_gencontrol -- -Vversion=$(version) -Vmajor=$(major) - dh_md5sums - dh_builddeb + dh_shlibdeps -a -ldebian/libicu$(major)/usr/lib + dh_gencontrol -a -- -Vversion=$(version) -Vmajor=$(major) + dh_md5sums -a + dh_builddeb -a # Automatically update changelog and control update-debian-files: