r1498 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2006-05-21 17:11:17 +0000 (Sun, 21 May 2006)
New Revision: 1498
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Enable the locales-all package. (Closes: #308020)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-21 07:11:54 UTC (rev 1497)
+++ glibc-package/trunk/debian/changelog 2006-05-21 17:11:17 UTC (rev 1498)
@@ -10,6 +10,7 @@
build options.
* Set the minimum kernel to 2.6.1 for the udeb package, except for i386,
m68k, mips, mipsel, powerpc and s390.
+ * Enable the locales-all package. (Closes: #308020)
-- Aurelien Jarno <aurel32@debian.org> Fri, 19 May 2006 05:49:18 +0000
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-05-21 07:11:54 UTC (rev 1497)
+++ glibc-package/trunk/debian/rules 2006-05-21 17:11:17 UTC (rev 1498)
@@ -135,8 +135,7 @@
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
-DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic
-#DEB_ARCH_REGULAR_PACKAGES += locales-all
+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
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-05-21 07:11:54 UTC (rev 1497)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-05-21 17:11:17 UTC (rev 1498)
@@ -110,14 +110,12 @@
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=$(DEB_SRCDIR)/localedata/SUPPORTED \
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
- if false; then \
$(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass) \
localedata/install-locales; \
rm -rf $(CURDIR)/debian/locales-all/usr/lib; \
install -d $(CURDIR)/debian/locales-all/usr/lib; \
mv $(CURDIR)/debian/tmp-libc/usr/lib/locale $(CURDIR)/debian/locales-all/usr/lib/locales-all; \
- fi; \
(cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
fi
Reply to: