copyright url and rules processing fixed

SamB · Jan 17, 2011 · d54fa19 · d54fa19
1 parent b900060
commit d54fa19
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/debian/copyright b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: dh-make
-Source: <url://example.com>
+Source: http://git.debian.org/?p=collab-maint/dh-make.git;a=summary
 
 Files: *
 Copyright: 1998-2011 Craig Small <csmall@debian.org>

diff --git a/dh_make b/dh_make
@@ -31,7 +31,7 @@ our $package_name="";
 our $cap_package_name="";
 our $version="";
 our $fullname = "";
-our $rules_format = "";
+our $rules_format = "dh7";
 our $source_file="";
 our $debian_native = 0;
 our $create_orig_tar = 0;
@@ -710,6 +710,13 @@ if ( ! $no_defaults )
 	@filenames = split / |\n/, qx{(cd $DHLIB/debian$package_type && ls)};
 	foreach $filename (@filenames)
 	{
+		if ( $filename=~/^rules/ )
+		{
+			if ( $filename ne "rules.$rules_format")
+			{
+				next;
+			}
+		}
 		process_file("$DHLIB/debian$package_type/$filename", $filename);
 	}
 }