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

[Mirco Bauer]

Author: meebey
Date: 2009-01-31 17:28:01 +0000 (Sat, 31 Jan 2009)
New Revision: 3900

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/debian/control
   cli-common/trunk/dh_clideps
   cli-common/trunk/dh_makeclilibs
Log:
make scripts backwards compatible with debhelper < 7.1



Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2009-01-29 23:30:20 UTC (rev 3899)
+++ cli-common/trunk/debian/changelog	2009-01-31 17:28:01 UTC (rev 3900)
@@ -1,4 +1,4 @@
-cli-common (0.6.0~pre1) UNRELEASED; urgency=low
+cli-common (0.6.0) experimental; urgency=low
 
   [ David Paleino ]
   * debian/control:
@@ -10,11 +10,11 @@
     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.
+    + Bumped Standards-Version to 3.8.0 (no changes needed)
 
- -- Mirco Bauer <meebey at debian.org>  Wed, 21 Jan 2009 23:40:21 +0100
+ -- Mirco Bauer <meebey at debian.org>  Sat, 31 Jan 2009 18:19:41 +0100
 
 cli-common (0.5.7) unstable; urgency=low
 

Modified: cli-common/trunk/debian/control
===================================================================
--- cli-common/trunk/debian/control	2009-01-29 23:30:20 UTC (rev 3899)
+++ cli-common/trunk/debian/control	2009-01-31 17:28:01 UTC (rev 3900)
@@ -11,7 +11,7 @@
  texlive-latex-extra,
  texlive-fonts-recommended,
  texlive-latex-recommended
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://alioth.debian.org/projects/pkg-cli-common/
 Vcs-Svn: svn://svn.debian.org/pkg-cli-common/package/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-common/package/trunk/
@@ -34,7 +34,7 @@
 Package: cli-common-dev
 Architecture: all
 Replaces: cli-common (<< 0.4.0)
-Depends: debhelper (>= 7.1.0),
+Depends: debhelper (>= 7.0.8),
  perl-modules,
  mono-utils (>= 2.0) | cil-disassembler,
  mono-devel (>= 2.0) | strong-name-tool,

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2009-01-29 23:30:20 UTC (rev 3899)
+++ cli-common/trunk/dh_clideps	2009-01-31 17:28:01 UTC (rev 3900)
@@ -86,8 +86,9 @@
 
 =cut
 
+# gar, debhelper 7.1 defines -d for all scripts already :(
 init(options => {
-  "d" => \$dh{D_FLAG},
+#  "d" => \$dh{D_FLAG},
   "r" => \$dh{R_FLAG},
   "l=s", => \$dh{L_PARAMS},
   "internal-mono"  => \$dh{INTERNAL_MONO_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: cli-common/trunk/dh_makeclilibs
===================================================================
--- cli-common/trunk/dh_makeclilibs	2009-01-29 23:30:20 UTC (rev 3899)
+++ cli-common/trunk/dh_makeclilibs	2009-01-31 17:28:01 UTC (rev 3900)
@@ -116,8 +116,9 @@
 
 =cut
 
+# gar, debhelper 7.1 defines -V for all scripts already :(
 init(options => {
-  "V", => \$dh{V_FLAG},
+#  "V", => \$dh{V_FLAG},
   "r" => \$dh{R_FLAG},
   "m=s" => \$dh{M_PARAMS},
   "l=s" => \$dh{L_PARAMS},
@@ -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";