r1665 - in glibc-package/branches/glibc-2.4/debian: . control.in debhelper.in
Author: barbier
Date: 2006-06-25 16:46:32 +0000 (Sun, 25 Jun 2006)
New Revision: 1665
Removed:
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:
Localedef can be used to handle compiled locale files, e.g.
as explained in locales-all/README.Debian, so revert r1649
and r1652 (which moved locale source files into a new
locales-data package) until a better solution is found.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-25 16:46:32 UTC (rev 1665)
@@ -57,9 +57,6 @@
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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-06-25 16:46:32 UTC (rev 1665)
@@ -25,27 +25,22 @@
glibc-doc-reference for licensing reasons.
Package: locales
-Architecture: any
+Architecture: all
Section: libs
Priority: standard
-Depends: ${locale:Depends}, debconf | debconf-2.0, locales-data
-Replaces: libc6 (<= 2.3.999.2-6)
-Conflicts: base-config, belocs-locales-bin
+Depends: ${locale:Depends}, debconf | debconf-2.0
+Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
-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.
+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.
-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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-25 16:46:32 UTC (rev 1665)
@@ -25,27 +25,22 @@
@glibc@-doc-reference for licensing reasons.
Package: locales
-Architecture: any
+Architecture: all
Section: libs
Priority: standard
-Depends: ${locale:Depends}, debconf | debconf-2.0, locales-data
-Replaces: @libc@ (<= 2.3.999.2-6)
-Conflicts: base-config, belocs-locales-bin
+Depends: ${locale:Depends}, debconf | debconf-2.0
+Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
-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.
+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.
-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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.manpages 2006-06-25 16:46:32 UTC (rev 1665)
@@ -6,6 +6,7 @@
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
Deleted: 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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-data.install 2006-06-25 16:46:32 UTC (rev 1665)
@@ -1,4 +0,0 @@
-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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install 2006-06-25 16:46:32 UTC (rev 1665)
@@ -1,5 +1,8 @@
+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/bin/localedef usr/bin
+debian/tmp-libc/usr/share/i18n/* usr/share/i18n
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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages 2006-06-25 16:46:32 UTC (rev 1665)
@@ -1,4 +1,3 @@
-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-23 23:11:23 UTC (rev 1664)
+++ glibc-package/branches/glibc-2.4/debian/rules 2006-06-25 16:46:32 UTC (rev 1665)
@@ -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 locales-all
-DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales-data
+DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic locales-all
+DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
# Generic kernel version check
Reply to: