r1173 - in glibc-package/trunk/debian: . control.in rules.d
Author: barbier
Date: 2006-02-14 21:52:33 +0000 (Tue, 14 Feb 2006)
New Revision: 1173
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/debver2localesdep.pl
glibc-package/trunk/debian/locales-depver
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Modify debver2localesdep.pl, locales-depver and control files to provide
a smooth upgrade in unstable when locales require changes in localedef.
This is the first part for solving #352620, the proper dependency for
locales will be set by the next upload.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-12 22:55:46 UTC (rev 1172)
+++ glibc-package/trunk/debian/changelog 2006-02-14 21:52:33 UTC (rev 1173)
@@ -3,6 +3,10 @@
[ Denis Barbier ]
* Updated debconf translations:
- Brazilian Portuguese, by André Luís Lopes (Closes: #352416)
+ * Modify debver2localesdep.pl, locales-depver and control files to provide
+ a smooth upgrade in unstable when locales require changes in localedef.
+ This is the first part for solving #352620, the proper dependency for
+ locales will be set by the next upload.
[ Clint Adams ]
* Add hurd-getresuid-dyslexia.diff (fixes incorrect ordering of
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-02-12 22:55:46 UTC (rev 1172)
+++ glibc-package/trunk/debian/control 2006-02-14 21:52:33 UTC (rev 1173)
@@ -53,7 +53,7 @@
Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
-Provides: ${locale:Depends}
+Provides: ${locale-compat:Depends}
Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -112,7 +112,7 @@
Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: debian-installer
Priority: extra
-Provides: libc6, libc-udeb, ${locale:Depends}
+Provides: libc6, libc-udeb, ${locale-compat:Depends}
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -125,7 +125,7 @@
Architecture: alpha ia64
Section: libs
Priority: required
-Provides: ${locale:Depends}
+Provides: ${locale-compat:Depends}
Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -184,7 +184,7 @@
Architecture: alpha ia64
Section: debian-installer
Priority: extra
-Provides: libc6.1, libc-udeb, ${locale:Depends}
+Provides: libc6.1, libc-udeb, ${locale-compat:Depends}
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -197,7 +197,7 @@
Architecture: hurd-i386
Section: libs
Priority: required
-Provides: ${locale:Depends}
+Provides: ${locale-compat:Depends}
Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -256,7 +256,7 @@
Architecture: hurd-i386
Section: debian-installer
Priority: extra
-Provides: libc0.3, libc-udeb, ${locale:Depends}
+Provides: libc0.3, libc-udeb, ${locale-compat:Depends}
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -269,7 +269,7 @@
Architecture: freebsd-i386
Section: libs
Priority: required
-Provides: ${locale:Depends}
+Provides: ${locale-compat:Depends}
Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -328,7 +328,7 @@
Architecture: freebsd-i386
Section: debian-installer
Priority: extra
-Provides: libc1, libc-udeb, ${locale:Depends}
+Provides: libc1, libc-udeb, ${locale-compat:Depends}
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2006-02-12 22:55:46 UTC (rev 1172)
+++ glibc-package/trunk/debian/control.in/libc 2006-02-14 21:52:33 UTC (rev 1173)
@@ -2,7 +2,7 @@
Architecture: @archs@
Section: libs
Priority: required
-Provides: ${locale:Depends}
+Provides: ${locale-compat:Depends}
Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -61,7 +61,7 @@
Architecture: @archs@
Section: debian-installer
Priority: extra
-Provides: @libc@, libc-udeb, ${locale:Depends}
+Provides: @libc@, libc-udeb, ${locale-compat:Depends}
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
Modified: glibc-package/trunk/debian/debver2localesdep.pl
===================================================================
--- glibc-package/trunk/debian/debver2localesdep.pl 2006-02-12 22:55:46 UTC (rev 1172)
+++ glibc-package/trunk/debian/debver2localesdep.pl 2006-02-14 21:52:33 UTC (rev 1173)
@@ -1,15 +1,18 @@
#!/usr/bin/perl
-$_ = shift;
+for my $i (0..$#ARGV) {
+ $_ = $ARGV[$i];
+ /(.*)-(.*)/m;
-/(.*)-(.*)/m;
+ $debver = $1;
+ $devrev = $2;
-$debver = $1;
-$devrev = $2;
+ @revs = split('\.', $devrev);
-@revs = split('\.', $devrev);
+ $devrev = $revs[0];
+ $devrev = "$devrev.$revs[1]" if defined($revs[1]) and $revs[1] ne "0";
-$devrev = $revs[0];
-$devrev = "$devrev.$revs[1]" if defined($revs[1]) and $revs[1] ne "0";
-
-print "glibc-$debver-$devrev\n";
+ print ", " if $i > 0;
+ print "glibc-$debver-$devrev";
+}
+print "\n";
Modified: glibc-package/trunk/debian/locales-depver
===================================================================
--- glibc-package/trunk/debian/locales-depver 2006-02-12 22:55:46 UTC (rev 1172)
+++ glibc-package/trunk/debian/locales-depver 2006-02-14 21:52:33 UTC (rev 1173)
@@ -1 +1,14 @@
+# When glibc is uploaded into unstable, the locales package is immediately
+# available because it is arch:all. But libc binary parckages 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.3.5-3
+LOCALES_COMPAT_VER = 2.3.5-12 2.3.5-3
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-12 22:55:46 UTC (rev 1172)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-14 21:52:33 UTC (rev 1173)
@@ -240,6 +240,7 @@
# 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
for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \
cp tmp.substvars debian/$$pkg.substvars; \
Reply to: