r973 - in glibc-package/trunk/debian: . rules.d
Author: gotom
Date: 2005-07-28 02:29:14 +0000 (Thu, 28 Jul 2005)
New Revision: 973
Added:
glibc-package/trunk/debian/locales-depver
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* Introduce loose locales version dependency to avoid locales version
mismatch for FTBFS architectures, taken from Jeff Bailey
<jbailey@ubuntu.com> (Closes: #204696, #308824):
- debian/locales-depver: New file, describes minimum locales dependency
version. It's renamed from locales-shlibver because it's not "shlib".
- debian/rules.d/debhelper.mk: Use LOCALES_DEP_VER to generate locales
dependency.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-07-28 02:24:48 UTC (rev 972)
+++ glibc-package/trunk/debian/changelog 2005-07-28 02:29:14 UTC (rev 973)
@@ -31,6 +31,14 @@
cannot work correctly.
- debian/sysdeps/alpha.mk: Likewise.
+ * Introduce loose locales version dependency to avoid locales version
+ mismatch for FTBFS architectures, taken from Jeff Bailey
+ <jbailey@ubuntu.com> (Closes: #204696, #308824):
+ - debian/locales-depver: New file, describes minimum locales dependency
+ version. It's renamed from locales-shlibver because it's not "shlib".
+ - debian/rules.d/debhelper.mk: Use LOCALES_DEP_VER to generate locales
+ dependency.
+
* debian/sysdeps/depflags.pl: Drop Depends: libdb1-compat because it's
until sarge stuff. Suggested by Colin Watson <cjwatson@debian.org>.
(Closes: #318885)
Added: glibc-package/trunk/debian/locales-depver
===================================================================
--- glibc-package/trunk/debian/locales-depver 2005-07-28 02:24:48 UTC (rev 972)
+++ glibc-package/trunk/debian/locales-depver 2005-07-28 02:29:14 UTC (rev 973)
@@ -0,0 +1 @@
+LOCALES_DEP_VER = 2.3.5-3
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2005-07-28 02:24:48 UTC (rev 972)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2005-07-28 02:29:14 UTC (rev 973)
@@ -233,7 +233,7 @@
perl -i -pe 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$j=<IN>;} s/__SUPPORTED_LOCALES__/$$j/g;' debian/locales.config
# Generate common substvars files.
- echo "locale:Depends=$(shell perl debian/debver2localesdep.pl $(DEB_VERSION))" > tmp.substvars
+ echo "locale:Depends=$(shell perl debian/debver2localesdep.pl $(LOCALES_DEP_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: