Author: barbier Date: 2006-06-10 22:34:18 +0000 (Sat, 10 Jun 2006) New Revision: 1649
Added: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-data.install Modified: glibc-package/branches/glibc-2.4/debian/changelog glibc-package/branches/glibc-2.4/debian/control glibc-package/branches/glibc-2.4/debian/control.in/main glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.manpages glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages glibc-package/branches/glibc-2.4/debian/rules Log: Add a new locales-data package which contains source locale files, and the locales package now contains programs needed to generate compiled locale files. Modified: glibc-package/branches/glibc-2.4/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-10 22:34:18 UTC (rev 1649) @@ -52,6 +52,9 @@ The whole glibc-2.4/manual directory is removed from glibc-2.4.tar.bz2. - debian/control: Drop Build-Depends: texinfo, texi2html. - debian/control: Drop references to the antique libc-doc package. + - Add a new locales-data package which contains source locale files, and + the locales package now contains programs needed to generate compiled + locale files. [ Michael Banck ] * debian/sysdeps/hurd.mk: Only use libidn for add-ons. Modified: glibc-package/branches/glibc-2.4/debian/control =================================================================== --- glibc-package/branches/glibc-2.4/debian/control 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/control 2006-06-10 22:34:18 UTC (rev 1649) @@ -25,22 +25,26 @@ glibc-doc-reference for licensing reasons. Package: locales -Architecture: all +Architecture: any Section: libs Priority: standard -Depends: ${locale:Depends}, debconf | debconf-2.0 -Conflicts: base-config, belocs-locales-bin, belocs-locales-data +Depends: ${locale:Depends}, debconf | debconf-2.0, locales-data +Conflicts: base-config, belocs-locales-bin Replaces: base-config, lliurex-belocs-locales-data -Description: GNU C Library: National Language (locale) data [support] - Machine-readable data files, shared objects and programs used by the - C library for localization (l10n) and internationalization (i18n) support. - . - This package contains the libc.mo i18n files, plus tools to generate - locale definitions from source files (included in this package). It allows - you to customize which definitions actually get generated. This is a - savings over how this package used to be, where all locales were generated - by default. This created a package that unpacked to an excess of 30 megs. +Description: GNU C Library: National Language (locale) programs + This package contains tools to generate locale definitions from source + files (included in the locales-data package). It allows you to customize + which definitions actually get generated. +Package: locales-data +Architecture: all +Section: libs +Priority: standard +Conflicts: belocs-locales-data +Replaces: locales +Description: GNU C Library: National Language (locale) data files + This package contains the libc.mo i18n files and locale source files. + Package: locales-all Architecture: any Section: libs Modified: glibc-package/branches/glibc-2.4/debian/control.in/main =================================================================== --- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-10 22:34:18 UTC (rev 1649) @@ -25,22 +25,26 @@ @[EMAIL PROTECTED] for licensing reasons. Package: locales -Architecture: all +Architecture: any Section: libs Priority: standard -Depends: ${locale:Depends}, debconf | debconf-2.0 -Conflicts: base-config, belocs-locales-bin, belocs-locales-data +Depends: ${locale:Depends}, debconf | debconf-2.0, locales-data +Conflicts: base-config, belocs-locales-bin Replaces: base-config, lliurex-belocs-locales-data -Description: GNU C Library: National Language (locale) data [support] - Machine-readable data files, shared objects and programs used by the - C library for localization (l10n) and internationalization (i18n) support. - . - This package contains the libc.mo i18n files, plus tools to generate - locale definitions from source files (included in this package). It allows - you to customize which definitions actually get generated. This is a - savings over how this package used to be, where all locales were generated - by default. This created a package that unpacked to an excess of 30 megs. +Description: GNU C Library: National Language (locale) programs + This package contains tools to generate locale definitions from source + files (included in the locales-data package). It allows you to customize + which definitions actually get generated. +Package: locales-data +Architecture: all +Section: libs +Priority: standard +Conflicts: belocs-locales-data +Replaces: locales +Description: GNU C Library: National Language (locale) data files + This package contains the libc.mo i18n files and locale source files. + Package: locales-all Architecture: any Section: libs Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.manpages =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.manpages 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.manpages 2006-06-10 22:34:18 UTC (rev 1649) @@ -6,7 +6,6 @@ debian/local/manpages/ldconfig.8 debian/local/manpages/ldd.1 debian/local/manpages/locale.1 -debian/local/manpages/localedef.1 debian/local/manpages/rpcinfo.8 debian/local/manpages/tzselect.1 debian/local/manpages/tzconfig.8 Added: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-data.install =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-data.install 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-data.install 2006-06-10 22:34:18 UTC (rev 1649) @@ -0,0 +1,4 @@ +debian/tmp-libc/usr/share/locale/[a-z][a-z] usr/share/locale +debian/tmp-libc/usr/share/locale/[a-z][a-z]_[A-Z][A-Z] usr/share/locale +debian/tmp-libc/usr/share/i18n/* usr/share/i18n +DEB_SRCDIR/localedata/README usr/share/doc/locales Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install 2006-06-10 22:34:18 UTC (rev 1649) @@ -1,8 +1,5 @@ -debian/tmp-libc/usr/share/locale/[a-z][a-z] usr/share/locale -debian/tmp-libc/usr/share/locale/[a-z][a-z]_[A-Z][A-Z] usr/share/locale debian/tmp-libc/usr/share/locale/locale.alias usr/share/locale -debian/tmp-libc/usr/share/i18n/* usr/share/i18n +debian/tmp-libc/usr/bin/localedef usr/bin debian/local/usr_sbin/locale-gen usr/sbin debian/local/usr_sbin/update-locale usr/sbin debian/local/usr_sbin/validlocale usr/sbin -DEB_SRCDIR/localedata/README usr/share/doc/locales Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages 2006-06-10 22:34:18 UTC (rev 1649) @@ -1,3 +1,4 @@ +debian/local/manpages/localedef.1 debian/local/manpages/locale-gen.8 debian/local/manpages/locale.gen.5 debian/local/manpages/update-locale.8 Modified: glibc-package/branches/glibc-2.4/debian/rules =================================================================== --- glibc-package/branches/glibc-2.4/debian/rules 2006-06-10 20:37:41 UTC (rev 1648) +++ glibc-package/branches/glibc-2.4/debian/rules 2006-06-10 22:34:18 UTC (rev 1649) @@ -131,8 +131,8 @@ # Which build pass are we on? curpass = $(filter-out %_,$(subst _,_ ,$@)) -DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic locales-all -DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales +DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic locales locales-all +DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales-data DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb # Generic kernel version check -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]