r6371 - in glibc-package/trunk/debian: . control.in rules.d
Author: aurel32
Date: 2015-03-08 21:29:32 +0000 (Sun, 08 Mar 2015)
New Revision: 6371
Removed:
glibc-package/trunk/debian/locales-depver
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
We have a transition mechanism for the locales, as the Debian archive
used to expose arch:all packages on all architectures even when the
corresponding arch:any package is not available yet. This has been
fixed long time ago, the transition mechanism has not been used
correctly for a lot of time and has been broken by the split out of
libc-bin. The breakage has been partially fixed by the "Breaks: locales
(<< 2.19)" added to libc6. It's now time to add the missing "Depends:
libc-bin (>> 2.19)" to locales and remove the transition mechanism.
Closes: #583088, #779442
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-03-08 16:58:05 UTC (rev 6370)
+++ glibc-package/trunk/debian/changelog 2015-03-08 21:29:32 UTC (rev 6371)
@@ -6,6 +6,17 @@
* patches/hurd-i386/cvs-libpthread-libc-lockP{,2}.diff: New patch to
dynamically call pthread functions from libc.
+ [ Aurelien Jarno ]
+ * We have a transition mechanism for the locales, as the Debian archive
+ used to expose arch:all packages on all architectures even when the
+ corresponding arch:any package is not available yet. This has been
+ fixed long time ago, the transition mechanism has not been used
+ correctly for a lot of time and has been broken by the split out of
+ libc-bin. The breakage has been partially fixed by the "Breaks: locales
+ (<< 2.19)" added to libc6. It's now time to add the missing "Depends:
+ libc-bin (>> 2.19)" to locales and remove the transition mechanism.
+ Closes: #583088, #779442
+
-- Aurelien Jarno <aurel32@debian.org> Sun, 08 Feb 2015 17:21:50 +0100
glibc (2.19-15) unstable; urgency=medium
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2015-03-08 16:58:05 UTC (rev 6370)
+++ glibc-package/trunk/debian/control 2015-03-08 21:29:32 UTC (rev 6371)
@@ -83,7 +83,7 @@
Architecture: all
Section: localization
Priority: standard
-Depends: ${locale:Depends}, ${misc:Depends}, debconf | debconf-2.0
+Depends: libc-bin (>> 2.19), ${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>
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2015-03-08 16:58:05 UTC (rev 6370)
+++ glibc-package/trunk/debian/control.in/main 2015-03-08 21:29:32 UTC (rev 6371)
@@ -83,7 +83,7 @@
Architecture: all
Section: localization
Priority: standard
-Depends: ${locale:Depends}, ${misc:Depends}, debconf | debconf-2.0
+Depends: libc-bin (>> 2.19), ${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>
Deleted: glibc-package/trunk/debian/locales-depver
===================================================================
--- glibc-package/trunk/debian/locales-depver 2015-03-08 16:58:05 UTC (rev 6370)
+++ glibc-package/trunk/debian/locales-depver 2015-03-08 21:29:32 UTC (rev 6371)
@@ -1,30 +0,0 @@
-# When glibc is uploaded into unstable, the locales package is immediately
-# available because it is arch:all. But libc binary packages are processed
-# by autobuilders and become available later.
-#
-# If compiling locales depend on a given version of localedef (for instance
-# when ISO codes are updated), the idea is to first bump LOCALES_COMPAT_VER and
-# make an upload without changing locales. When this version is available on
-# all architectures in unstable, locales can be modified and LOCALES_DEP_VER
-# is bumped too.
-#
-# LOCALES_COMPAT_VER must always contain two values during the transition phase
-# so that dependencies in unstable can always be satisfied, and
-# LOCALES_DEP_VER point to the highest value of LOCALES_COMPAT_VER when
-# packages are available for all architectures in unstable.
-
-LOCALES_DEP_VER = 2.19-1
-LOCALES_COMPAT_VER = 2.19-1
-
-# Previous versions:
-# 2.7-1: glibc 2.7
-# 2.8-1: glibc 2.8
-# 2.9-1: eglibc 2.9
-# 2.10-1: eglibc 2.10
-# 2.11-1: eglibc 2.11
-# 2.13-1: eglibc 2.13
-# 2.15-1: eglibc 2.15
-# 2.16-1: eglibc 2.16
-# 2.17-1: eglibc 2.17
-# 2.18-1: eglibc 2.18
-# 2.19-1: eglibc 2.19
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2015-03-08 16:58:05 UTC (rev 6370)
+++ glibc-package/trunk/debian/rules 2015-03-08 21:29:32 UTC (rev 6371)
@@ -36,9 +36,6 @@
include debian/shlibver
shlib_dep = $(libc) (>= $(shlib_dep_ver))
-# The version of the C library that locales needs for its format.
-include debian/locales-depver
-
# Beyond here you shouldn't need to customise anything:
export SHELL = /bin/bash -e
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2015-03-08 16:58:05 UTC (rev 6370)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2015-03-08 21:29:32 UTC (rev 6371)
@@ -178,10 +178,8 @@
perl -i -pe 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$j=<IN>;} s/__PROVIDED_LOCALES__/$$j/g;' debian/locales.config debian/locales.postinst
# Generate common substvars files.
- echo "locale:Depends=$(shell perl debian/debver2localesdep.pl $(LOCALES_DEP_VER))" > tmp.substvars
- echo "locale-compat:Depends=$(shell perl debian/debver2localesdep.pl $(LOCALES_COMPAT_VER))" >> tmp.substvars
ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
- echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' >> tmp.substvars
+ echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' > tmp.substvars
endif
for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \
Reply to: