r2740 - trunk/scripts

[Andres Salomon]

Author: dilinger-guest
Date: 2005-03-20 00:33:28 +0100 (Sun, 20 Mar 2005)
New Revision: 2740

Modified:
   trunk/scripts/prune-non-free
Log:
add the bit to ensure our debian directory doesn't get nuked


Modified: trunk/scripts/prune-non-free
===================================================================
--- trunk/scripts/prune-non-free	2005-03-19 23:28:07 UTC (rev 2739)
+++ trunk/scripts/prune-non-free	2005-03-19 23:33:28 UTC (rev 2740)
@@ -231,6 +231,18 @@
 	mf.close
 end
 
+def dont_nuke_debian_dir(free_dir)
+	name = 'scripts/package/Makefile'
+	mf = File.open(name + '.new', 'w')
+	File.open(name).each { |line|
+		if line !~ /\/debian\//
+			mf << line
+		end
+	}
+	mf.close
+	FileUtils.mv(name + '.new', name)
+end
+
 raise "Usage: #{$0} <kernel tarball>" unless ARGV.length == 1
 
 # Create source directories
@@ -269,13 +281,13 @@
 # Generate non-free driver's makefile
 mk_makefile("#{nonfree_dir}/Makefile", free_dir, makefiles)
 
+dont_nuke_debian_dir(free_dir)
+
 # Tar up the kernel source trees
 pack("kernel-source-#{version}_#{version}.orig.tar.gz", free_dir)
 FileUtils.rm_rf(free_dir) 
 pack("kernel-source-nonfree-#{version}_#{version}.orig.tar.gz", nonfree_dir)
 FileUtils.rm_rf(nonfree_dir)
 
-# Upstream deletes our debian directory.  Bastards.
-#sed -i 's#^.*/debian/$##' scripts/package/Makefile
 
-exit 0
+exit(0)