r5068 - in glibc-package/trunk/debian: . patches rules.d
Author: aurel32
Date: 2011-12-10 21:08:14 +0000 (Sat, 10 Dec 2011)
New Revision: 5068
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/svn-updates.diff
glibc-package/trunk/debian/rules.d/tarball.mk
Log:
* debian/rules.d/tarball.mk: ignore manual/ directory.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-12-10 21:02:08 UTC (rev 5067)
+++ glibc-package/trunk/debian/changelog 2011-12-10 21:08:14 UTC (rev 5068)
@@ -44,7 +44,8 @@
linuxthreads version of pthread.h. Closes: #647823.
* Update from the latest SVN, branch eglibc-2_13.
* Add patches/amd64/cvs-pthread_cond_wait.diff to correctly handle EAGAIN
- from FUTEX_WAIT_REQUEUE_PI..
+ from FUTEX_WAIT_REQUEUE_PI.
+ * debian/rules.d/tarball.mk: ignore manual/ directory.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-setresid.diff: New patch to fix -1 passed to
Modified: glibc-package/trunk/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/trunk/debian/patches/svn-updates.diff 2011-12-10 21:02:08 UTC (rev 5067)
+++ glibc-package/trunk/debian/patches/svn-updates.diff 2011-12-10 21:08:14 UTC (rev 5068)
@@ -324,21 +324,6 @@
if (__res_initstamp != resp->_u._ext.initstamp) {
if (resp->nscount > 0)
__res_iclose (resp, true);
---- a/manual/Makefile (revision 12776)
-+++ b/manual/Makefile (revision 16174)
-@@ -114,9 +114,9 @@
- # Package version and bug reporting URL.
- pkgvers.texi: stamp-pkgvers
- stamp-pkgvers:
-- echo "@set PKGVERSION $(PKGVERSION)" > pkgvers-tmp
-- echo "@set REPORT_BUGS_TO $(REPORT_BUGS_TO)" \
-- | sed -e 's/@/@@/g' >> pkgvers-tmp
-+ echo "@set PKGVERSION $(subst @,@@,$(PKGVERSION))" > pkgvers-tmp
-+ echo "@set REPORT_BUGS_TO $(subst @,@@,$(REPORT_BUGS_TO))" \
-+ >> pkgvers-tmp
- $(move-if-change) pkgvers-tmp pkgvers.texi
- touch $@
-
--- a/ChangeLog.eglibc (revision 12776)
+++ b/ChangeLog.eglibc (revision 16174)
@@ -1,3 +1,37 @@
Modified: glibc-package/trunk/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/tarball.mk 2011-12-10 21:02:08 UTC (rev 5067)
+++ glibc-package/trunk/debian/rules.d/tarball.mk 2011-12-10 21:08:14 UTC (rev 5068)
@@ -24,5 +24,5 @@
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)/libc | filterdiff --addoldprefix=a/ --addnewprefix=b/ -x 'manual/*' >> $(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: