[Mud-builder-commits] r136 - in trunk: . lib/MUD lib/MUD/Fetch

[jaffa at garage.maemo.org]

Author: jaffa
Date: 2007-02-07 22:27:27 +0200 (Wed, 07 Feb 2007)
New Revision: 136

Modified:
   trunk/TODO
   trunk/lib/MUD/Build.pm
   trunk/lib/MUD/Fetch/Debian.pm
   trunk/lib/MUD/Package.pm
Log:
Check package names are lower case, add ability to override debian build dependencies, set mud-builder-team as upload.

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2007-02-07 20:27:07 UTC (rev 135)
+++ trunk/TODO	2007-02-07 20:27:27 UTC (rev 136)
@@ -5,8 +5,6 @@
 Outstanding tasks:
 
   * Sources.list keeps growing (reported by Kees Jongenburger)
-  * Force maintainer to be a MUD-owned address (mud-builder-team).
-  * Ensure packages are lowercase.
   * Auto-derive licence from files.
   * Auto-derive description from files/Google.
   * Run commands post/pre-patch (by convention(?))
@@ -34,6 +32,10 @@
 
 Completed tasks:
 
+  * Allow overriding of Debian build dependencies [DONE]
+  * Ensure packages are lowercase. [DONE]
+  * Force maintainer to be a MUD-owned address (mud-builder-team). [DONE]
+  * Force build despite debhelper and other build dep issues. [DONE]
   * Rename build directory to <name>-<version>, if necessary. [DONE]
   * Add Subversion fetcher [DONE by MUD::Fetch::Command]
   * Add file system fetcher (suggested by Ted Zlatanov)

Modified: trunk/lib/MUD/Build.pm
===================================================================
--- trunk/lib/MUD/Build.pm	2007-02-07 20:27:07 UTC (rev 135)
+++ trunk/lib/MUD/Build.pm	2007-02-07 20:27:27 UTC (rev 136)
@@ -251,9 +251,10 @@
     close(IN);
     my $origControl = $control;
 
-    # -- Fix standards version...
+    # -- Fix standards version and uploaders...
     #
     $control = MUD::Package->setField($control, 'Standards-Version', '3.6.0');
+    $control = MUD::Package->setField($control, 'Uploaders', 'MUD Project <mud-builder-team at garage.maemo.org>');
 
     # -- Fix "BROKEN" libraries...
     #
@@ -262,7 +263,8 @@
 
     # -- Fix section...
     #
-    my $userSection = $self->{data}->{data}->{deb}->{'prefix-section'};
+    my $userSection = $self->{data}->{data}->{deb}->{'prefix-section'} ||
+                     ($self->{package} =~ /^lib/);
     $userSection = 1 unless defined($userSection);
     if ($userSection) {
        $control =~ s/^(Section:)\s*(user\/)*(.*)$/$1 user\/$3/mig;

Modified: trunk/lib/MUD/Fetch/Debian.pm
===================================================================
--- trunk/lib/MUD/Fetch/Debian.pm	2007-02-07 20:27:07 UTC (rev 135)
+++ trunk/lib/MUD/Fetch/Debian.pm	2007-02-07 20:27:27 UTC (rev 136)
@@ -36,12 +36,15 @@
     $self->{package}->{build} = $buildDir.'/'.$d[0];
 
     chdir $self->{package}->{build};
-    my $deps = `dpkg-checkbuilddeps 2>&1`;
-    if ($?) {
-        $deps =~ s/.*Unmet build dependencies: //is;
-        my %list = map { $_ => 0 }
-                   grep { /^[\w\._\-]+$/ }
-                   split /[\s\r\n]+/, $deps;
+    my %list = ();
+    my $deps = $self->{package}->{data}->{fetch}->{depends} ||
+                  `dpkg-checkbuilddeps 2>&1`;
+    $deps =~ s/.*Unmet build dependencies: //is;
+    my %list = map { $_ => 0 }
+               grep { /^[\w\._\-]+$/ }
+               split /[\s\r\n]+/, $deps;
+
+    if (keys(%list)) {
 	warn "Need extra deps: ".join(", ", keys(%list))."\n";
         foreach my $dep (keys %list) {
             my $build;

Modified: trunk/lib/MUD/Package.pm
===================================================================
--- trunk/lib/MUD/Package.pm	2007-02-07 20:27:07 UTC (rev 135)
+++ trunk/lib/MUD/Package.pm	2007-02-07 20:27:27 UTC (rev 136)
@@ -33,6 +33,7 @@
     my $self = shift;
     my ($name) = @_;
 
+    croak "Package names must be lowercase.\n" if lc($name) ne $name;
     my $file = $self->{config}->directory('PACKAGES_DIR') . "/$name.xml";
     croak("Unknown package '$name': can't find [$file]") unless -f $file;