[Pkg-ocaml-maint-commits] r5946 - in /trunk/packages/edos-debcheck/trunk/debian: changelog contrib/edos-builddebcheck contrib/edos-builddebcheck.1 control edos-builddebcheck edos-builddebcheck.1 rules

Fri Aug 15 01:57:27 UTC 2008

Author: treinen
Date: Fri Aug 15 01:57:27 2008
New Revision: 5946

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5946
Log:
integrate edos-buildebcheck into the package

Added:
    trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck   (contents, props changed)
      - copied, changed from r5945, trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck
    trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck.1   (contents, props changed)
      - copied, changed from r5945, trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck.1
Removed:
    trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck
    trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck.1
Modified:
    trunk/packages/edos-debcheck/trunk/debian/changelog
    trunk/packages/edos-debcheck/trunk/debian/control
    trunk/packages/edos-debcheck/trunk/debian/rules

Modified: trunk/packages/edos-debcheck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/changelog?rev=5946&op=diff
==============================================================================

--- trunk/packages/edos-debcheck/trunk/debian/changelog (original)
+++ trunk/packages/edos-debcheck/trunk/debian/changelog Fri Aug 15 01:57:27 2008
@@ -5,6 +5,9 @@
   * fix spelling of Debian in package description, as suggested by
     Raphael Geissert (closes: Bug#480961).
   * Standards-Version 3.8.0 (no change)
+  * Added edos-builddebcheck wrapper to check for satisfiability of
+    build-dependencies (closes: Bug#494600). This neccessitates a
+    Recommends: python-debian.
 
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
@@ -16,7 +19,7 @@
   * add contributed script debian/contrib/add-sources.py, used to mangle
     Packages/Sources to detect unbuildable packages
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 08 Jan 2008 09:04:21 +0100
+ -- Ralf Treinen <treinen at debian.org>  Fri, 15 Aug 2008 03:38:45 +0200
 
 edos-debcheck (1.0-6) unstable; urgency=low
 

Copied: trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck (from r5945, trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck?rev=5946&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck (original)
+++ trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck Fri Aug 15 01:57:27 2008
@@ -1,8 +1,16 @@
 #!/usr/bin/perl
+
+open(D,"dpkg-query -W python-debian|");
+die "The package 'python-debian' is necessary to run this program"
+    unless <D> =~ /^python-debian\s/;
+close D;
 
 $debug=0;
 
-$edosoptions = "";
+# the prefix used to encode source packages
+$sourceprefix="source---";
+
+$edosoptions = "-failures -explain";
 while ( $arg = shift @ARGV ) {
     if ( $arg eq '-a' || $arg eq '--architecture' ) {
 	if ($#ARGV == -1) {
@@ -11,7 +19,7 @@
 	    $architecture = shift @ARGV;
 	}
     } elsif ( $arg =~ /^-.*/ ) {
-	$edosoptions .= " $arg";
+	die "unrecognized option: $arg";
     } else {
 	last;
     }
@@ -59,4 +67,28 @@
     }
 }
 
-print "Packagearch: $packagearch\n";
+open(RESULT,"/usr/share/edos-debcheck/add-sources.py < $packagefile $sourcesfile $architecture ".
+    "| edos-debcheck $edosoptions|");
+
+$instanza=0;
+
+while (<RESULT>) {
+    if (/^\s+/ && $instanza) {
+	s/^(\s*)source---(.*)(depends on|conflicts with)/$1$2build-$3/;
+	print;
+    } else {
+	if (/^source---.*: FAILED/) {
+	    s/^source---//;
+	    print;
+	    
+	    $_=<RESULT>;
+	    print;
+	    
+	    $instanza=1;
+	} else {
+	    $instanza=0;
+	}
+    }
+}
+
+close RESULT;

Propchange: trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck
------------------------------------------------------------------------------
    svn:executable = *

Propchange: trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck.1 (from r5945, trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck.1)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck.1?rev=5946&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/edos-builddebcheck.1 (original)
+++ trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck.1 Fri Aug 15 01:57:27 2008
@@ -45,24 +45,6 @@
 Check for compilation on \fIarchitecture\fP. Usually it is not
 necessary to specify the architecture since it can be derived from the Packages
 file.
-.TP
-.B -check
-Double-check the results
-.TP
-.B -explain
-Explain the results
-.TP
-.B -rules
-Print generated rules
-.TP
-.B -failures
-Only show failures
-.TP
-.B -successes
-Only show successes
-.TP
-.B -help, --help
-Display this list of options
 
 .SH AUTHOR
 Edos-builddebcheck has been written by Stefano Zacchirolli and Ralf Treinen.

Propchange: trunk/packages/edos-debcheck/trunk/debian/contrib/edos-builddebcheck.1
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/packages/edos-debcheck/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/control?rev=5946&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/control (original)
+++ trunk/packages/edos-debcheck/trunk/debian/control Fri Aug 15 01:57:27 2008
@@ -11,7 +11,7 @@
 
 Package: edos-debcheck
 Architecture: any
-Depends: ${shlibs:Depends}, ${F:OCamlRun}
+Depends: ${shlibs:Depends}, ${F:OCamlRun}, perl
 Recommends: python-debian
 Description: Checks whether dependencies of Debian packages can be satisfied
  This software checks for every package of a distribution (in the

Modified: trunk/packages/edos-debcheck/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/rules?rev=5946&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/rules (original)
+++ trunk/packages/edos-debcheck/trunk/debian/rules Fri Aug 15 01:57:27 2008
@@ -30,11 +30,16 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -A /usr/bin /usr/share/man/man1
+	dh_installdirs /usr/share/edos-debcheck
 	cp debcheck$(if $(BYTECODE),.byte) \
 		debian/edos-debcheck/usr/bin/edos-debcheck
+	cp debian/contrib/edos-builddebcheck debian/edos-debcheck/usr/bin
+	cp debian/contrib/add-sources.py \
+		debian/edos-debcheck/usr/share/edos-debcheck
 	cp rpmcheck$(if $(BYTECODE),.byte) \
 		debian/edos-rpmcheck/usr/bin/edos-rpmcheck
-	dh_installman -pedos-debcheck debian/edos-debcheck.1
+	dh_installman -pedos-debcheck \
+		debian/edos-debcheck.1 debian/contrib/edos-builddebcheck.1
 	dh_installman -pedos-rpmcheck debian/edos-rpmcheck.1
 
 binary-arch: build install


