r1303 - in glibc-package/branches/glibc-2.4/debian: . rules.d
Author: barbier
Date: 2006-03-23 21:35:08 +0000 (Thu, 23 Mar 2006)
New Revision: 1303
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/rules.d/tarball.mk
Log:
debian/rules.d/tarball.mk: glibc-<foo>-2.4.tar.bz2 add-on unpacks
into either <foo> or glibc-<foo>-2.4, in which case it is renamed
into <foo>.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-22 22:09:41 UTC (rev 1302)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-23 21:35:08 UTC (rev 1303)
@@ -21,6 +21,9 @@
- Remove complex-collate.diff (merged upstream).
- Remove cvs-{localedata,iso4217,iso639,tzdata}.diff,
- Remove from forward-backward-collation.diff a chunk merged upstream.
+ - debian/rules.d/tarball.mk: glibc-<foo>-2.4.tar.bz2 add-on unpacks
+ into either <foo> or glibc-<foo>-2.4, in which case it is renamed
+ into <foo>.
-- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/tarball.mk 2006-03-22 22:09:41 UTC (rev 1302)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/tarball.mk 2006-03-23 21:35:08 UTC (rev 1303)
@@ -11,6 +11,11 @@
$(patsubst %,$(stamp)%,$(GLIBC_OVERLAYS)):
cd $(DEB_SRCDIR) && tar -xjvf $(CURDIR)/$(notdir $@)
+ a=`echo $(notdir $@) | sed -e 's/^glibc-//' -e 's/-[^-]*$$//'`; \
+ d=`echo $(notdir $@) | sed -e 's/\.tar\.bz2$$//'`; \
+ if test -d $(DEB_SRCDIR)/$$d; then \
+ cd $(DEB_SRCDIR) && mv $$d $$a; \
+ fi
touch $@
Reply to: