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

Mirco Bauer meebey-guest at costa.debian.org
Sun Jan 15 04:04:58 UTC 2006


Author: meebey-guest
Date: 2006-01-15 04:04:55 +0000 (Sun, 15 Jan 2006)
New Revision: 2170

Modified:
   cli-common/trunk/cli-policy.sgml
   cli-common/trunk/debian/changelog
   cli-common/trunk/dh_clideps
Log:
- cli-common 0.2.4



Modified: cli-common/trunk/cli-policy.sgml
===================================================================
--- cli-common/trunk/cli-policy.sgml	2006-01-15 03:25:02 UTC (rev 2169)
+++ cli-common/trunk/cli-policy.sgml	2006-01-15 04:04:55 UTC (rev 2170)
@@ -13,7 +13,7 @@
   </author>
   
   <version>
-    Version 0.2.0
+    Version 0.2.1
   </version>
 
   <abstract>
@@ -51,6 +51,13 @@
     <p>Here are the changes to the Debian CLI Policy document.</p>
     
     <p>
+      Changes from 0.2.0 to 0.2.1:
+      <list>
+        <item><ref id="cli-common">: Added examples for debhelper and CDBS.</item>
+      </list>
+    </p>
+
+    <p>
       Changes from 0.1.1 to 0.2.0:
       <list>
         <item><ref id="history">: Added chapter "Policy History"</item>
@@ -148,15 +155,17 @@
       <heading>cli-common</heading> 
       
       <p>All CLI applications/libraries must build-depend on
-      <package>cli-common</package> (&gt;= 0.1.3) and use the included dh_*
+      <package>cli-common</package> (&gt;= 0.2.0) and use the included dh_*
       scripts (this version may change later, when cli-common has changes which
       are required to be used by all CLI packages, the CLI Policy version will
       represent such change).</p>
       
-      <p><em>Be sure to run dh_makeclilibs before dh_clideps!</em> Otherwise,
-      if two binary packages from the same source package depend on one
+      <p>
+      <p><em>Be sure to run dh_shlibdeps (if the package is arch-dep) before
+      dh_clideps is called. Also run dh_makeclilibs before dh_clideps!</em>
+      Otherwise, if two binary packages from the same source package depend on one
       another, dh_clideps will not be able to determine depedencies.</p>
-      
+
       <p>See <manref name="dh_clideps" section="1"> or <manref
       name="dh_makeclilibs" section="1"> for details about the parameters.</p>
       
@@ -165,6 +174,9 @@
         
         <p>
           <list>
+            <item>Call dh_shlibdeps in the binary-arch stage of debian/rules,
+            this is required so dh_clideps will not generate duplicate
+            dependencies (if used with -d parameter).</item>
             <item>Call dh_clideps in the binary-indep stage of debian/rules to
             generate a list of runtime dependencies, similar to dh_shlibdeps.
             </item>
@@ -179,12 +191,46 @@
         <p>
           <list>
             <item>Call dh_makeclilibs in the binary-indep stage of debian/rules
-            if your package contains DLLs that other packages may make use of
-            (e.g. libgtk2.0-cil or libgecko-cil). It will generate a clilib
-            file similiar to dh_makeshlibs.</item>
+            if your package contains libraries (*.dll files) that other
+            packages may make use of (e.g. libgtk2.0-cil or libgecko-cil). It
+            will generate a clilib file similiar to dh_makeshlibs.</item>
           </list>
         </p>
       </sect1>
+
+      <sect1>
+        <heading>Debhelper Example</heading>
+        <p>
+          For binary-arch packages:
+          <example>
+binary-arch: build install
+        ...
+        dh_shlibdeps -a
+        dh_makeclilibs -V
+        dh_clideps -a -d
+        ...
+          </example>
+
+          For binary-indep packages:
+          <example>
+binary-indep: build install
+        dh_makeclilibs -V
+        dh_clideps -i
+          </example>
+        </p>
+      </sect1>
+
+      <sect1>
+        <heading>CDBS Example</heading>
+        <p>
+          <example>
+common-binary-predeb-arch common-binary-predeb-indep::
+	dh_shlibdeps
+	dh_makeclilibs -V
+	dh_clideps -d
+          </example>
+        </p>
+      </sect1>
     </sect>
   </chapt>
 
@@ -194,11 +240,11 @@
     
     <p>Source code files (*.cs, *.vb, *.boo, etc) should be non-executable.</p>
 
-    <p>*.dll files (libraries) should be non-executable.<p>
+    <p>Library files (*.dll) should be non-executable.<p>
 
-    <p>*.mdb files (debug symbols) should be non-executable.<p>
+    <p>Debug symbol files (*.mdb) should be non-executable.<p>
    
-    <p>*.exe files (applications) must have the executable flag (+x) set to be
+    <p>Application files (*.exe) must have the executable flag (+x) set to be
     compatibile with binfmt (direct invokation like ./foo.exe).</p>
     
     <p>To insure that the file permissions are right, you should call the

Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2006-01-15 03:25:02 UTC (rev 2169)
+++ cli-common/trunk/debian/changelog	2006-01-15 04:04:55 UTC (rev 2170)
@@ -1,3 +1,11 @@
+cli-common (0.2.4) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + Includes CLI policy version 0.2.1.
+    + Added LD_LIBRARY_PATH to "mono" call for internal-mono mode.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 15 Jan 2005 05:04:28 +0100
+
 cli-common (0.2.3) unstable; urgency=low
 
   * Mirco 'meebey' Bauer

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2006-01-15 03:25:02 UTC (rev 2169)
+++ cli-common/trunk/dh_clideps	2006-01-15 04:04:55 UTC (rev 2170)
@@ -72,7 +72,7 @@
     my $pwd=`pwd`;
     chomp $pwd;
     $cli_parser = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 $pwd/debian/tmp/usr/bin/monodis";
-    $cli_version = `debian/tmp/usr/bin/mono --version 2>&1`;
+    $cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`;
     verbose_print("Will use built Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/monodis") {
     $clr = "mono";




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