Author: aurel32
Date: 2008-08-09 15:56:07 +0000 (Sat, 09 Aug 2008)
New Revision: 3062
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/locales-depver
glibc-package/branches/glibc-2.8/debian/rules
glibc-package/branches/glibc-2.8/debian/rules.d/build.mk
glibc-package/branches/glibc-2.8/debian/rules.d/tarball.mk
glibc-package/branches/glibc-2.8/debian/shlibver
Log:
- Replace the ~ (causing a lot of problems) in the version with a +
- A few fixes
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-09 05:08:56 UTC
(rev 3061)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-09 15:56:07 UTC
(rev 3062)
@@ -1,4 +1,4 @@
-glibc (2.8~20080808-1) UNRELEASED; urgency=low
+glibc (2.8+20080809-1) UNRELEASED; urgency=low
[ Aurelien Jarno ]
* New upstream release.
@@ -77,7 +77,7 @@
* Add symbols files for the various libraries, based on a patch by
Raphaël Hertzog. Closes: #462444.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 08 Aug 2008 05:48:15 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 09 Aug 2008 09:28:22 +0200
glibc (2.7-14) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.8/debian/locales-depver
===================================================================
--- glibc-package/branches/glibc-2.8/debian/locales-depver 2008-08-09
05:08:56 UTC (rev 3061)
+++ glibc-package/branches/glibc-2.8/debian/locales-depver 2008-08-09
15:56:07 UTC (rev 3062)
@@ -13,8 +13,8 @@
# 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.8~
-LOCALES_COMPAT_VER = 2.8~
+LOCALES_DEP_VER = 2.8
+LOCALES_COMPAT_VER = 2.8
# Previous versions:
# 2.7-1: glibc 2.7
Modified: glibc-package/branches/glibc-2.8/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules 2008-08-09 05:08:56 UTC
(rev 3061)
+++ glibc-package/branches/glibc-2.8/debian/rules 2008-08-09 15:56:07 UTC
(rev 3062)
@@ -58,7 +58,7 @@
DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut
-f 2 -d ':'))
DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d '
')
-GLIBC_VERSION = $(shell echo $(DEB_VERSION) | sed -e 's/~.*//')
+GLIBC_VERSION = $(shell echo $(DEB_VERSION) | sed -e 's/+.*//')
DEB_BUILDDIR ?= $(build-tree)/$(DEB_HOST_ARCH)-$(curpass)
Modified: glibc-package/branches/glibc-2.8/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-09
05:08:56 UTC (rev 3061)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-09
15:56:07 UTC (rev 3062)
@@ -112,9 +112,9 @@
echo Testing $(curpass); \
find $(DEB_BUILDDIR) -name '*.out' -exec rm {} ';' ; \
TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS)
-k check 2>&1 | tee -a $(log_test); \
- chmod +x debian/testsuite-checking/convertlog.sh; \
+ chmod +x debian/testsuite-checking/convertlog.sh ; \
debian/testsuite-checking/convertlog.sh $(log_test) > $(log_results)
; \
- if -f $(log_expected) ; then ; \
+ if test -f $(log_expected) ; then \
chmod +x debian/testsuite-checking/compare.sh ; \
debian/testsuite-checking/compare.sh $(log_expected) $(log_results)
; \
else \
Modified: glibc-package/branches/glibc-2.8/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules.d/tarball.mk 2008-08-09
05:08:56 UTC (rev 3061)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/tarball.mk 2008-08-09
15:56:07 UTC (rev 3062)
@@ -1,6 +1,6 @@
GLIBC_PSERVER = :pserver:[EMAIL PROTECTED]:/cvs/glibc
GLIBC_BRANCH = glibc-$(subst .,_,$(GLIBC_VERSION))-branch
-GLIBC_SNAPSHOT = $(GLIBC_VERSION)~$(shell date "+%Y%m%d")
+GLIBC_SNAPSHOT = $(GLIBC_VERSION)+$(shell date "+%Y%m%d")
GLIBC_DIR = glibc-$(GLIBC_SNAPSHOT)
DEB_ORIG = ../glibc_$(GLIBC_SNAPSHOT).orig.tar.gz
Modified: glibc-package/branches/glibc-2.8/debian/shlibver
===================================================================
--- glibc-package/branches/glibc-2.8/debian/shlibver 2008-08-09 05:08:56 UTC
(rev 3061)
+++ glibc-package/branches/glibc-2.8/debian/shlibver 2008-08-09 15:56:07 UTC
(rev 3062)
@@ -1 +1 @@
-shlib_dep_ver = 2.8~
+shlib_dep_ver = 2.8
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
