r6503 - in glibc-package/branches/glibc-2.21/debian: . control.in debhelper.in
Author: aurel32
Date: 2015-08-28 22:36:30 +0000 (Fri, 28 Aug 2015)
New Revision: 6503
Added:
glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-l10n.install
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/control
glibc-package/branches/glibc-2.21/debian/control.in/libc
glibc-package/branches/glibc-2.21/debian/control.in/main
glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.install
glibc-package/branches/glibc-2.21/debian/rules
Log:
Move translation to a new libc-l10n package from the locales packages.
Add a dependency from locales and locales-all to libc-l10n, so that they
both provide the same feature. Closes: #788352.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-08-28 22:14:58 UTC (rev 6502)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-08-28 22:36:30 UTC (rev 6503)
@@ -92,6 +92,9 @@
- Fix a buffer overflow in overflow in getanswer_r (CVE-2015-1781)
Closes: #796105.
* sysdeps/linux.mk: don't build pt_chown (CVE-2013-2207). Closes: #717544.
+ * Move translation to a new libc-l10n package from the locales packages.
+ Add a dependency from locales and locales-all to libc-l10n, so that they
+ both provide the same feature. Closes: #788352.
[ Breno Leitao ]
* Remove --without-cvs that is not used anymore as a valid configuration.
Modified: glibc-package/branches/glibc-2.21/debian/control
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control 2015-08-28 22:14:58 UTC (rev 6502)
+++ glibc-package/branches/glibc-2.21/debian/control 2015-08-28 22:36:30 UTC (rev 6503)
@@ -52,6 +52,18 @@
This package contains utility programs related to the GNU C Library
development package.
+Package: libc-l10n
+Architecture: all
+Section: localization
+Priority: standard
+Depends: ${misc:Depends}
+Breaks: locales (<< 2.21-0experimental1)
+Replaces: locales (<< 2.21-0experimental1)
+Build-Profiles: <!stage1>
+Description: GNU C Library: localization files
+ This package contains the translation files for the GNU C library and
+ utility programs.
+
Package: glibc-doc
Architecture: all
Section: doc
@@ -83,7 +95,7 @@
Architecture: all
Section: localization
Priority: standard
-Depends: libc-bin (>> 2.21), ${misc:Depends}, debconf | debconf-2.0
+Depends: libc-bin (>> 2.21), libc-l10n (>> 2.21), ${misc:Depends}, debconf | debconf-2.0
Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data, manpages-fr-extra (<< 20141022)
Build-Profiles: <!stage1>
@@ -91,19 +103,18 @@
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 space-saver over how this package used to be,
- with all locales generated by default. This created a package that
- unpacked to an excess of 30 megs.
+ This package contains 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 space-saver over how this
+ package used to be, with all locales generated by default. This created
+ a package that unpacked to an excess of 30 megs.
Package: locales-all
Architecture: any
Section: localization
Priority: extra
Multi-Arch: foreign
-Depends: ${locale:Depends}, ${misc:Depends}
+Depends: libc-l10n (>> 2.21), ${misc:Depends}
Breaks: locales (<< 2.13-17)
Provides: locales
Build-Profiles: <!stage1>
@@ -151,7 +162,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
-Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
@@ -237,7 +248,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
-Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
@@ -323,7 +334,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
-Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
@@ -409,7 +420,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
-Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Modified: glibc-package/branches/glibc-2.21/debian/control.in/libc
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-08-28 22:14:58 UTC (rev 6502)
+++ glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-08-28 22:36:30 UTC (rev 6503)
@@ -5,7 +5,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
-Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Modified: glibc-package/branches/glibc-2.21/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/main 2015-08-28 22:14:58 UTC (rev 6502)
+++ glibc-package/branches/glibc-2.21/debian/control.in/main 2015-08-28 22:36:30 UTC (rev 6503)
@@ -52,6 +52,18 @@
This package contains utility programs related to the GNU C Library
development package.
+Package: libc-l10n
+Architecture: all
+Section: localization
+Priority: standard
+Depends: ${misc:Depends}
+Breaks: locales (<< 2.21-0experimental1)
+Replaces: locales (<< 2.21-0experimental1)
+Build-Profiles: <!stage1>
+Description: GNU C Library: localization files
+ This package contains the translation files for the GNU C library and
+ utility programs.
+
Package: glibc-doc
Architecture: all
Section: doc
@@ -83,7 +95,7 @@
Architecture: all
Section: localization
Priority: standard
-Depends: libc-bin (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0
+Depends: libc-bin (>> @GLIBC_VERSION@), libc-l10n (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0
Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data, manpages-fr-extra (<< 20141022)
Build-Profiles: <!stage1>
@@ -91,19 +103,18 @@
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 space-saver over how this package used to be,
- with all locales generated by default. This created a package that
- unpacked to an excess of 30 megs.
+ This package contains 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 space-saver over how this
+ package used to be, with all locales generated by default. This created
+ a package that unpacked to an excess of 30 megs.
Package: locales-all
Architecture: any
Section: localization
Priority: extra
Multi-Arch: foreign
-Depends: ${locale:Depends}, ${misc:Depends}
+Depends: libc-l10n (>> @GLIBC_VERSION@), ${misc:Depends}
Breaks: locales (<< 2.13-17)
Provides: locales
Build-Profiles: <!stage1>
Added: glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-l10n.install
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-l10n.install (rev 0)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-l10n.install 2015-08-28 22:36:30 UTC (rev 6503)
@@ -0,0 +1,2 @@
+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
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.install
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.install 2015-08-28 22:14:58 UTC (rev 6502)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.install 2015-08-28 22:36:30 UTC (rev 6503)
@@ -1,5 +1,3 @@
-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 /etc
debian/tmp-libc/usr/share/i18n/* usr/share/i18n
debian/local/usr_sbin/locale-gen usr/sbin
Modified: glibc-package/branches/glibc-2.21/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules 2015-08-28 22:14:58 UTC (rev 6502)
+++ glibc-package/branches/glibc-2.21/debian/rules 2015-08-28 22:36:30 UTC (rev 6503)
@@ -146,7 +146,7 @@
DEB_UDEB_PACKAGES =
else
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-pic libc-bin libc-dev-bin multiarch-support
- DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source locales
+ DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source libc-l10n locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
## Locales can only be pre-generated during native compiles
ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
Reply to: