r3725 - in glibc-package/branches/eglibc-2.10/debian: . patches rules.d
Author: aurel32
Date: 2009-07-31 00:48:49 +0000 (Fri, 31 Jul 2009)
New Revision: 3725
Added:
glibc-package/branches/eglibc-2.10/debian/patches/svn-updates.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
glibc-package/branches/eglibc-2.10/debian/rules.d/tarball.mk
Log:
* debian/rules.d/tarball.mk: add an "update-from-upstream-svn" rule to
automatically update debian/patches/svn-updates.diff.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-30 23:03:39 UTC (rev 3724)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-31 00:48:49 UTC (rev 3725)
@@ -100,6 +100,8 @@
on HPPA.
* debian/rules.d/tarball.mk: store the checkout revision in the tarball
(file .svn-revision).
+ * debian/rules.d/tarball.mk: add an "update-from-upstream-svn" rule to
+ automatically update debian/patches/svn-updates.diff.
[ Petr Salinger ]
* Add kfreebsd/local-no-SOCK_NONBLOCK.diff to fix build on GNU/kFreeBSD.
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-07-30 23:03:39 UTC (rev 3724)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-07-31 00:48:49 UTC (rev 3725)
@@ -1,3 +1,5 @@
+#svn-updates.diff
+
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff
locale/preprocessor-collate-uli-sucks.diff
Added: glibc-package/branches/eglibc-2.10/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/svn-updates.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/svn-updates.diff 2009-07-31 00:48:49 UTC (rev 3725)
@@ -0,0 +1 @@
+SVN updates
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/tarball.mk 2009-07-30 23:03:39 UTC (rev 3724)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/tarball.mk 2009-07-31 00:48:49 UTC (rev 3725)
@@ -3,9 +3,12 @@
EGLIBC_CHECKOUT = eglibc-checkout
EGLIBC_DIR = eglibc-$(EGLIBC_VERSION)
DEB_ORIG = ../eglibc_$(EGLIBC_VERSION).orig.tar.gz
+DEB_ORIG_REVISION = $(shell cat .svn-revision 2> /dev/null)
+SVN_UPDATES_DIFF = debian/patches/svn-updates.diff
get-orig-source: $(DEB_ORIG)
$(DEB_ORIG):
+ dh_testdir
svn co $(EGLIBC_SVN)/$(EGLIBC_BRANCH) $(EGLIBC_CHECKOUT)
svn export $(EGLIBC_CHECKOUT)/libc $(EGLIBC_DIR)
svn export $(EGLIBC_CHECKOUT)/linuxthreads/linuxthreads $(EGLIBC_DIR)/linuxthreads
@@ -15,3 +18,11 @@
rm -fr $(EGLIBC_DIR)/manual
tar -zcf $(DEB_ORIG) $(EGLIBC_DIR)
rm -rf $(EGLIBC_DIR) $(EGLIBC_CHECKOUT)
+
+update-from-upstream-svn:
+ dh_testdir
+ test -n "$(DEB_ORIG_REVISION)"
+ echo "SVN update of $(EGLIBC_SVN)/$(EGLIBC_BRANCH) from revision $(DEB_ORIG_REVISION)" > $(SVN_UPDATES_DIFF)
+ echo "" >> $(SVN_UPDATES_DIFF)
+ svn diff -r$(DEB_ORIG_REVISION) $(EGLIBC_SVN)/$(EGLIBC_BRANCH)/libc | filterdiff --addoldprefix=a/ --addnewprefix=b/ >> $(SVN_UPDATES_DIFF)
+ svn diff -r$(DEB_ORIG_REVISION) $(EGLIBC_SVN)/$(EGLIBC_BRANCH)/ports | filterdiff --addoldprefix=a/ports/ --addnewprefix=b/ports/ >> $(SVN_UPDATES_DIFF)
Reply to: