[Cdd-commits] r582 - cdd/trunk/cdd/devtools

[CDD Subversion Commit]

Author: tille
Date: Mon Mar  3 07:19:58 2008
New Revision: 582

Modified:
   cdd/trunk/cdd/devtools/Makefile
   cdd/trunk/cdd/devtools/rules
Log:
More fixes to enable offline building of packages


Modified: cdd/trunk/cdd/devtools/Makefile
==============================================================================
--- cdd/trunk/cdd/devtools/Makefile	(original)
+++ cdd/trunk/cdd/devtools/Makefile	Mon Mar  3 07:19:58 2008
@@ -18,7 +18,8 @@
 all: $(CDD)-tasks.desc debian/control
 
 debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
-	(cat debian/control.stub; \
+	(echo "XS-Comment: This file is autogenerated via "make -f debian/rules dist".  Do not edit!"; \
+	 cat debian/control.stub; \
 	 test -f config/control && ( cat config/control; echo ) ; \
 	$(GENCONTROL) -s $(TARGET_DIST) -D -c -m -i -A) > $@.new && mv $@.new $@
 

Modified: cdd/trunk/cdd/devtools/rules
==============================================================================
--- cdd/trunk/cdd/devtools/rules	(original)
+++ cdd/trunk/cdd/devtools/rules	Mon Mar  3 07:19:58 2008
@@ -26,7 +26,8 @@
 	$(MAKE) -f $(CDDMKFILE) $(CDD)-tasks.desc
 
 build: 
-	$(MAKE) -f $(CDDMKFILE) all
+	## Don't build debian/control and tasks.desc at package build time
+	# $(MAKE) -f $(CDDMKFILE) all
 	dh_testdir
 
 clean:
@@ -48,8 +49,8 @@
 	      debian/90$(PREFIX)-config
 	# remove auto generated debconf template translations
 	rm -rf debian/po
-	# Remove auto generated tasksel descriptions:
-	rm -f $(CDDNAME)-tasks.desc
+	# DO NOT Remove auto generated tasksel descriptions - it sticks to the source
+	# rm -f $(CDDNAME)-tasks.desc
 
 	dh_clean build-stamp
 
@@ -65,7 +66,9 @@
 	rm -rf $(DISTDIR)
 	mkdir $(DISTDIR)
 	chmod 777 $(DISTDIR)
-	rsync -a --exclude $(DISTDIR) --exclude CVS --exclude .svn --exclude svn-commit.tmp * $(DISTDIR)
+	rsync -a --exclude $(DISTDIR) \
+	         --exclude CVS --exclude .svn --exclude svn-commit.tmp \
+	         * $(DISTDIR)
 	rm -f `find . -name "*~"`
 	GZIP=-9 tar -czf ../$(CDDNAME)_$(VERSION).tar.gz $(DISTDIR)
 	rm -rf $(DISTDIR)