posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 46ece81bbe982ddd5f96430adc52660a35a153d6..e94ead5ad1f5422fa8dea2a801ca54fc6a02822b 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-set -x
 
 function echo_usage {
        echo "usage: mconfigure <package> [options]"
@@ -60,7 +59,7 @@ function set_build {
 function check_version {
        
        vline=$(head -1 debian/$paket.changelog)
-       vline=${vline%-*}
+       vline=${vline%[-)]*}
        clversion=${vline#*(}
        if [ $version = "0.0" ]
        then
@@ -134,7 +133,7 @@ fi
 if [ $configure -eq 1 ]
 then
        # delete changelog and control
-       rm debian/changelog debian/control || true
+       rm debian/changelog debian/control 2>/dev/null || true
        
        # mconfigure builds 2 environment files: setenv.sh + rules.pre
        
@@ -190,7 +189,7 @@ then
                    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
        fi
        
-       cat setenv.sh >> rules.pre
+       #cat setenv.sh >> rules.pre
 
        mkdir -p tmp/DEBIAN
 
@@ -222,10 +221,10 @@ then
                        echo "  this file is necessary for any package production."
                else    
                        echo "Source: $paket
-       Section: main
-       Priority: optional
-       Maintainer: WagnerTech UG <mail@wagnertech.de>
-       " > debian/$paket.control
+Section: main
+Priority: optional
+Maintainer: WagnerTech UG <mail@wagnertech.de>
+" > debian/$paket.control
                        grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
                fi
        fi
@@ -249,6 +248,14 @@ then
        if [ -f debian/$paket.cp -a -f debian/$paket.control ]
        then
                echo "PACK=binary" >> debian/rules.pre
+               if grep "^Architecture: *all" debian/$paket.control >/dev/null
+               then
+                       echo "arch = all" >> debian/rules.pre
+                       echo "BINARY_INDEP = copy ../${paket}_$version-${build}_all.deb" >> debian/rules.pre
+               else
+                       echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
+                       echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
+               fi
        elif [ -f debian/$paket.cp ]
        then
                echo "PACK=zip" >> debian/rules.pre