[Blends-commit] r1983 - in blends/trunk/blends: debian devtools

[Debian Pure Blends Subversion Commit]

Author: tille
Date: Sat Nov  7 18:59:26 2009
New Revision: 1983
URL: http://svn.debian.org/viewsvn/blends?rev=1983&view=rev

Log:
ensure that debian/control and tasksel.desc will be created in any run of make dist


Modified:
   blends/trunk/blends/debian/changelog
   blends/trunk/blends/devtools/Makefile
   blends/trunk/blends/devtools/rules

Modified: blends/trunk/blends/debian/changelog
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/changelog?rev=1983&view=diff&r1=1983&r2=1982&p1=blends/trunk/blends/debian/changelog&p2=blends/trunk/blends/debian/changelog
==============================================================================
--- blends/trunk/blends/debian/changelog	(original)
+++ blends/trunk/blends/debian/changelog	Sat Nov  7 18:59:26 2009
@@ -1,8 +1,15 @@
-blends (0.6.7) UNRELEASED; urgency=low
+blends (0.6.7) unstable; urgency=low
 
   * Better documentation how to generate tasks pages
+  * devtools/Makefile: Remove tasksel .desc and debian/control
+    file in dist target to ensure that these will be created in
+    any case
+    Closes: #554261
+  * devtools/rules: Do not remove the autogenerated files
+    automatically in get-orig-source target because there are
+    people who explicitly like to commit these to SVN
 
- -- Andreas Tille <tille at debian.org>  Sun, 23 Aug 2009 09:08:47 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 04 Nov 2009 22:25:05 +0100
 
 blends (0.6.6) unstable; urgency=low
 

Modified: blends/trunk/blends/devtools/Makefile
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/Makefile?rev=1983&view=diff&r1=1983&r2=1982&p1=blends/trunk/blends/devtools/Makefile&p2=blends/trunk/blends/devtools/Makefile
==============================================================================
--- blends/trunk/blends/devtools/Makefile	(original)
+++ blends/trunk/blends/devtools/Makefile	Sat Nov  7 18:59:26 2009
@@ -56,5 +56,6 @@
 	rm -f debian/control
 	rm -f $(BLEND)-tasks.desc
 
-dist: $(BLEND)-tasks.desc debian/control
+dist:
+	rm -f $(BLEND)-tasks.desc debian/control
 	make -f debian/rules get-orig-source

Modified: blends/trunk/blends/devtools/rules
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/rules?rev=1983&view=diff&r1=1983&r2=1982&p1=blends/trunk/blends/devtools/rules&p2=blends/trunk/blends/devtools/rules
==============================================================================
--- blends/trunk/blends/devtools/rules	(original)
+++ blends/trunk/blends/devtools/rules	Sat Nov  7 18:59:26 2009
@@ -80,6 +80,3 @@
 	rm -f `find $(DISTDIR) -name "*~"`
 	GZIP=-9 tar -czf ../$(BLENDNAME)_$(VERSION).tar.gz $(DISTDIR)
 	rm -rf $(DISTDIR)
-	# remove auto generated files from SVN dir where it should not be stored
-	rm -f debian/control $(BLEND)-tasks.desc
-