X Strike Force XOrg SVN commit: r14 - in xorg/trunk/debian: . scripts
Author: fabbione
Date: 2004-10-01 07:06:17 -0500 (Fri, 01 Oct 2004)
New Revision: 14
Added:
xorg/trunk/debian/scripts/indipendent-sources
Modified:
xorg/trunk/debian/CHANGESETS
xorg/trunk/debian/TODO
xorg/trunk/debian/rules
xorg/trunk/debian/scripts/split-source
Log:
Add support for "banned sources" in scripts/split-source.
Add scripts/indipendent-sources as list of packages that should not be shipped.
Modified: xorg/trunk/debian/CHANGESETS
===================================================================
--- xorg/trunk/debian/CHANGESETS 2004-10-01 05:23:26 UTC (rev 13)
+++ xorg/trunk/debian/CHANGESETS 2004-10-01 12:06:17 UTC (rev 14)
@@ -11,4 +11,9 @@
* Import basic debian/* files
9
+* Add support for "banned sources" in scripts/split-source and add
+ scripts/indipendent-sources as general list of packages we do
+ not want to ship.
+ 14
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg/trunk/debian/TODO
===================================================================
--- xorg/trunk/debian/TODO 2004-10-01 05:23:26 UTC (rev 13)
+++ xorg/trunk/debian/TODO 2004-10-01 12:06:17 UTC (rev 14)
@@ -21,7 +21,6 @@
* Define complete name scheme for foo package that Build-dep on -source-
and binar{y,ies} package{,s} it will build.
* Document package relationship (dia diagram?).
-* Add banned_directories support in scripts/split-source.
* lintian/linda clean up.
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg/trunk/debian/rules
===================================================================
--- xorg/trunk/debian/rules 2004-10-01 05:23:26 UTC (rev 13)
+++ xorg/trunk/debian/rules 2004-10-01 12:06:17 UTC (rev 14)
@@ -26,7 +26,10 @@
$(STAMP_DIR)/build: $(patched)
chmod +x debian/scripts/split-source
mkdir -p $(SOURCE_DIR)/tarballs
- ./debian/scripts/split-source $(CURDIR)/build-tree $(TAR_DIR) $(CURDIR)/$(SOURCE_DIR)/tarballs
+ ./debian/scripts/split-source $(CURDIR)/build-tree \
+ $(TAR_DIR) \
+ $(CURDIR)/$(SOURCE_DIR)/tarballs \
+ $(CURDIR)/debian/scripts/indipendent-sources
touch $@
Added: xorg/trunk/debian/scripts/indipendent-sources
===================================================================
--- xorg/trunk/debian/scripts/indipendent-sources 2004-10-01 05:23:26 UTC (rev 13)
+++ xorg/trunk/debian/scripts/indipendent-sources 2004-10-01 12:06:17 UTC (rev 14)
@@ -0,0 +1,12 @@
+# $Id$
+
+# List of sources that should not be built from this package because they have
+# gained their own indipendency from X tree.
+#
+# Format: one entry for each line.
+#
+# Example: programs-xset
+# will skip xc/programs/xset and the result xorg-source-programs-xset.tar.gz
+# not generated.
+
+# vim:set ai et sts=4 sw=4 tw=80:
Property changes on: xorg/trunk/debian/scripts/indipendent-sources
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg/trunk/debian/scripts/split-source
===================================================================
--- xorg/trunk/debian/scripts/split-source 2004-10-01 05:23:26 UTC (rev 13)
+++ xorg/trunk/debian/scripts/split-source 2004-10-01 12:06:17 UTC (rev 14)
@@ -12,6 +12,7 @@
path="$1"
src="$2"
dst="$3"
+banfile="$4"
cd $path
@@ -30,7 +31,11 @@
for i in $expandedlist; do
tarname=$(echo $i | sed -e 's/\//-/g' -e 's/'$src'-//g')
- tar zclp -f $dst/xorg-source-$tarname.tar.gz $i
+ if ! grep -q ^$tarname$ $banfile; then
+ tar zclp -f $dst/xorg-source-$tarname.tar.gz $i
+ else
+ echo skipping $tarname
+ fi
done
# handle special "config" case to include top level files and Imakefiles
Reply to: