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

[Debian Pure Blends Subversion Commit]

Author: tille
Date: Sun Aug  9 19:57:00 2009
New Revision: 1757
URL: http://svn.debian.org/viewsvn/blends?rev=1757&view=rev

Log:
Make sure that there is really something to copy in /etc/cdd before trying in preinst script


Modified:
   blends/trunk/blends/debian/blends-dev.preinst
   blends/trunk/blends/debian/changelog
   blends/trunk/blends/devtools/rules

Modified: blends/trunk/blends/debian/blends-dev.preinst
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/blends-dev.preinst?rev=1757&view=diff&r1=1757&r2=1756&p1=blends/trunk/blends/debian/blends-dev.preinst&p2=blends/trunk/blends/debian/blends-dev.preinst
==============================================================================
--- blends/trunk/blends/debian/blends-dev.preinst	(original)
+++ blends/trunk/blends/debian/blends-dev.preinst	Sun Aug  9 19:57:00 2009
@@ -6,7 +6,9 @@
 
 if [ -d /etc/cdd ] ; then
     mkdir -p /etc/blends
-    cp -u -a /etc/cdd/sources* /etc/blends
+    if ls /etc/cdd/sources* 1>/dev/null 2>/dev/null ; then
+        cp -u -a /etc/cdd/sources* /etc/blends
+    fi
 fi
 
 #DEBHELPER#

Modified: blends/trunk/blends/debian/changelog
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/changelog?rev=1757&view=diff&r1=1757&r2=1756&p1=blends/trunk/blends/debian/changelog&p2=blends/trunk/blends/debian/changelog
==============================================================================
--- blends/trunk/blends/debian/changelog	(original)
+++ blends/trunk/blends/debian/changelog	Sun Aug  9 19:57:00 2009
@@ -1,3 +1,12 @@
+blends (0.6.5) unstable; urgency=low
+
+  * remove minor debugging code from debian/rules
+  * debian/blends-dev.preinst: make sure there are really
+    old sources.list files to copy before trying to do this
+    Closes: #540603
+
+ -- Andreas Tille <tille at debian.org>  Sun, 09 Aug 2009 07:48:39 +0200
+
 blends (0.6.4) unstable; urgency=low
 
   * devtools/blend-get-names: Enable Blends without prefix "debian-"

Modified: blends/trunk/blends/devtools/rules
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/rules?rev=1757&view=diff&r1=1757&r2=1756&p1=blends/trunk/blends/devtools/rules&p2=blends/trunk/blends/devtools/rules
==============================================================================
--- blends/trunk/blends/devtools/rules	(original)
+++ blends/trunk/blends/devtools/rules	Sun Aug  9 19:57:00 2009
@@ -33,10 +33,7 @@
 	dh $@
 
 override_dh_install:
-	#if grep "^Architecture: " debian/control | grep -q -v "all$" ; then \
-	    echo "$(BLEND_INSTALL_HELPER)" ; \
-	    $(BLEND_INSTALL_HELPER) ; \
-	#fi
+	$(BLEND_INSTALL_HELPER)
 	dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel
 
 override_dh_installdocs: