r2256 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian

[Joshua Kwan]

Author: joshk
Date: 2005-01-10 17:54:52 +0100 (Mon, 10 Jan 2005)
New Revision: 2256

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
Log:
change make condition into runtime condition

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-01-10 09:44:12 UTC (rev 2255)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-01-10 16:54:52 UTC (rev 2256)
@@ -7,10 +7,12 @@
     local attacker to execute code as root; CAN-2004-1235.
     (closes: #289155) (Maximilian Attems)
   * 121_drm-locking-checks-1.diff 121_drm-locking-checks-2.diff:
-     [SECURITY] Fix insufficient locking checks in DRM code; CAN-2004-1056 
+     [SECURITY] Fix insufficient locking checks in DRM code; CAN-2004-1056
      (Fabio M. Di Nitto, Dann Frazier, Simon Horman). (Closes: Bug#285563)
+  * Turn a make conditional into a runtime conditional to allow debian/rules
+    prune to work. closes: #289682
 
- -- Simon Horman <horms@debian.org>  Fri,  7 Jan 2005 16:48:31 +0900
+ -- Joshua Kwan <joshk@triplehelix.org>  Mon, 10 Jan 2005 08:59:42 -0800
 
 kernel-source-2.4.27 (2.4.27-7) unstable; urgency=low
 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2005-01-10 09:44:12 UTC (rev 2255)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2005-01-10 16:54:52 UTC (rev 2256)
@@ -22,13 +22,13 @@
 	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
 
 ../orig/kernel-source-$(upstream)-$(upstream):
-ifneq (,$(wildcard ../kernel-source-$(upstream)_$(upstream).orig.tar.gz))
+	if [ ! -f "../kernel-source-$(upstream)_$(upstream).orig.tar.gz" ]; then \
+		echo "Can't find orig tarball." >&2; \
+		exit 1; \
+	fi
 	mkdir -p ../orig
 	tar -C ../orig -xzf ../kernel-source-$(upstream)_$(upstream).orig.tar.gz
 	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .
-else
-$(error "Can't find orig tarball.")
-endif
 
 orig: ../orig/kernel-source-$(upstream)-$(upstream)
 	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .