[Pkg-mono-svn-commits] rev 3901 - mono/trunk/debian

Mirco Bauer meebey at alioth.debian.org
Sat Jan 31 17:30:32 UTC 2009


Author: meebey
Date: 2009-01-31 17:30:32 +0000 (Sat, 31 Jan 2009)
New Revision: 3901

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/dh_makeclilibs
Log:
  * debian/dh_clideps
    debian/dh_makeclilibs:
    + Re-synced from cli-common 0.6.0, needed for dh 7.0 backwards
      compatibilty.



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2009-01-31 17:28:01 UTC (rev 3900)
+++ mono/trunk/debian/changelog	2009-01-31 17:30:32 UTC (rev 3901)
@@ -7,6 +7,10 @@
       versions, as found in Ubuntu.
   * debian/control:
     + Lowered debhelper build-dep to >= 5.
+  * debian/dh_clideps
+    debian/dh_makeclilibs:
+    + Re-synced from cli-common 0.6.0, needed for dh 7.0 backwards
+      compatibilty.
 
  -- Mirco Bauer <meebey at debian.org>  Tue, 27 Jan 2009 00:15:04 +0100
 

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2009-01-31 17:28:01 UTC (rev 3900)
+++ mono/trunk/debian/dh_clideps	2009-01-31 17:30:32 UTC (rev 3901)
@@ -86,6 +86,7 @@
 
 =cut
 
+# gar, debhelper 7.1 defines -d for all scripts already :(
 init(options => {
 #  "d" => \$dh{D_FLAG},
   "r" => \$dh{R_FLAG},
@@ -132,7 +133,8 @@
   $mono_path       = $ENV{'MONO_PATH'} if exists $ENV{'MONO_PATH'};
 }
 
-if (defined($dh{INTERNAL_MONO_FLAG})) {
+if (defined($dh{INTERNAL_MONO_FLAG}) ||
+    (defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
     $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: mono/trunk/debian/dh_makeclilibs
===================================================================
--- mono/trunk/debian/dh_makeclilibs	2009-01-31 17:28:01 UTC (rev 3900)
+++ mono/trunk/debian/dh_makeclilibs	2009-01-31 17:30:32 UTC (rev 3901)
@@ -116,6 +116,7 @@
 
 =cut
 
+# gar, debhelper 7.1 defines -V for all scripts already :(
 init(options => {
 #  "V", => \$dh{V_FLAG},
   "r" => \$dh{R_FLAG},
@@ -130,7 +131,8 @@
 my $cli_parser;
 my $sn = 'sn';
 
-if (defined($dh{INTERNAL_MONO_FLAG})) {
+if (defined($dh{INTERNAL_MONO_FLAG}) ||
+    (defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
     $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";




More information about the Pkg-mono-svn-commits mailing list