[Pkg-mono-svn-commits] rev 3890 - in cli-common/trunk: . debian

[Mirco Bauer]

Author: meebey
Date: 2009-01-21 22:49:47 +0000 (Wed, 21 Jan 2009)
New Revision: 3890

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/debian/control
   cli-common/trunk/dh_clideps
   cli-common/trunk/dh_makeclilibs
Log:
cli-common *love*



Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2009-01-21 21:01:30 UTC (rev 3889)
+++ cli-common/trunk/debian/changelog	2009-01-21 22:49:47 UTC (rev 3890)
@@ -1,12 +1,21 @@
-cli-common (0.5.8) UNRELEASED; urgency=low
+cli-common (0.6.0~pre1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * debian/control:
     + Updated mono-1.0-devel build-dependency to mono-devel, as "sn" is now
       part of mono-devel.
 
- -- Mirco Bauer <meebey at debian.org>  Sun, 23 Nov 2008 16:38:46 +0100
+  [ Mirco Bauer ]
+  * debian/dh_clideps
+    debian/dh_makeclilibs:
+    + Pass parameters we use to init() of debhelper (as required by dh 7.1).
+  * debian/control:
+    + Bumped debhelper binary dependency for cli-common-dev to >= 7.1.0
+    + Versioned mono-devel and mono-utils dependency for cli-common-dev to
+      ensure we get an experimental buildd friendly version.
 
+ -- Mirco Bauer <meebey at debian.org>  Wed, 21 Jan 2009 23:40:21 +0100
+
 cli-common (0.5.7) unstable; urgency=low
 
   * The "debhelper 7 integration" release

Modified: cli-common/trunk/debian/control
===================================================================
--- cli-common/trunk/debian/control	2009-01-21 21:01:30 UTC (rev 3889)
+++ cli-common/trunk/debian/control	2009-01-21 22:49:47 UTC (rev 3890)
@@ -34,10 +34,10 @@
 Package: cli-common-dev
 Architecture: all
 Replaces: cli-common (<< 0.4.0)
-Depends: debhelper (>= 7.0.8),
+Depends: debhelper (>= 7.1.0),
  perl-modules,
- mono-utils | cil-disassembler,
- mono-devel | strong-name-tool,
+ mono-utils (>= 2.0) | cil-disassembler,
+ mono-devel (>= 2.0) | strong-name-tool,
  libxml-dom-perl
 Description: common files for building CLI packages
  This package must be installed if a CLI (Common Language Infrastructure)

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2009-01-21 21:01:30 UTC (rev 3889)
+++ cli-common/trunk/dh_clideps	2009-01-21 22:49:47 UTC (rev 3890)
@@ -28,8 +28,8 @@
 will use the embedded dependency information to generate a dependency
 string on assembly and shared libs packages, including the setting of
 version ranges (as declared by the shlibs/clilibs files of the used
-packages). The dependency on a certain CLR (.NET runtime) version will be
-also added to the final variable.
+packages). The dependency on a certain CLR (Common Language Runtime)
+version will be also added to the final variable.
 
 Note: the dependencies on shared libraries may be not resolved correctly
 if there are no .config files associated with the the .exe/.dll file
@@ -86,7 +86,12 @@
 
 =cut
 
-init();
+init(options => {
+  "d" => \$dh{D_FLAG},
+  "r" => \$dh{R_FLAG},
+  "l=s", => \$dh{L_PARAMS},
+  "internal-mono"  => \$dh{INTERNAL_MONO_FLAG},
+});
 
 my $clr;
 my $cli = '/usr/bin/cli';
@@ -127,7 +132,7 @@
   $mono_path       = $ENV{'MONO_PATH'} if exists $ENV{'MONO_PATH'};
 }
 
-if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
+if (defined($dh{INTERNAL_MONO_FLAG})) {
     $clr = "mono";
     $cli_parser = "$pwd/debian/tmp/usr/bin/monodis";
     $cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$mono_path:$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 MONO_GAC_PREFIX=$mono_gac_prefix ";

Modified: cli-common/trunk/dh_makeclilibs
===================================================================
--- cli-common/trunk/dh_makeclilibs	2009-01-21 21:01:30 UTC (rev 3889)
+++ cli-common/trunk/dh_makeclilibs	2009-01-21 22:49:47 UTC (rev 3890)
@@ -75,7 +75,7 @@
 Exclude files that contain "item" anywhere in their filename or directory 
 from being treated as shared libraries.
 
-=item B<internal-mono>
+=item B<--internal-mono>
 
 Uses the Mono runtime in . (used for bootstrapping Mono packages)
 
@@ -116,7 +116,13 @@
 
 =cut
 
-init();
+init(options => {
+  "V", => \$dh{V_FLAG},
+  "r" => \$dh{R_FLAG},
+  "m=s" => \$dh{M_PARAMS},
+  "l=s" => \$dh{L_PARAMS},
+  "internal-mono"  => \$dh{INTERNAL_MONO_FLAG},
+});
 
 my $clr;
 my $cli = '/usr/bin/cli';
@@ -124,7 +130,7 @@
 my $cli_parser;
 my $sn = 'sn';
 
-if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
+if (defined($dh{INTERNAL_MONO_FLAG})) {
     $clr = "mono";
     my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0";
     $cli_parser = "$mono_path debian/tmp/usr/bin/monodis";
@@ -233,22 +239,22 @@
                 $version = $dh{M_PARAMS};
             }
             if ($dh{V_FLAG_SET}) {
-                if ( $dh{V_FLAG} ne '' ) {
+                if ($dh{V_FLAG} ne '' ) {
                     $deps = $dh{V_FLAG};
                 } else {
                     $deps = "$package (>= $version)";
                 }
             }
-            if (defined( $dh{R_FLAG})) {
+            if (defined($dh{R_FLAG})) {
                 $version =~ s/-[^-]+$//;
                 my @uvers = split ( /\./, $version );
                 $uvers[1]++;
                 $deps = "$package (>= $version), $package (<< ".join(".", @uvers).")";
             }
-            if (defined( $dh{M_PARAMS})) {
+            if (defined($dh{M_PARAMS})) {
                 $deps = "$package (>= ".$dh{M_PARAMS}.")";
             }
-            if (defined( $dh{L_PARAMS})) {
+            if (defined($dh{L_PARAMS})) {
                 $deps .= ", $package (<< ".$dh{L_PARAMS}.")";
             }
             if (defined($library) &&