posaune

diff --git a/debian/mbuild.changelog b/debian/mbuild.changelog
index 6c503a99988966de77efa7a42eb76f5ffb70fffb..800b645bc84de20c01c3d8b6821f848312e90f8a 100644 (file)
--- a/debian/mbuild.changelog
+++ b/debian/mbuild.changelog
@@ -4,9 +4,9 @@ projects (0.2-%BUILD%) unstable; urgency=medium
   * new options
   * including pre/post installation scripts
   * packing for tgz and versioning
   * new options
   * including pre/post installation scripts
   * packing for tgz and versioning

- -- Michael Wagner <michael@wagnertech.de>  Fr 10. Aug 22:54:48 CEST 2018
+ -- Michael Wagner <michael@wagnertech.de>  Fri, 10 Aug 2018 22:54:48 +0100

 
 

-projects (0.1-%BUILD%) unstable; urgency=medium
+projects (0.1-nn) unstable; urgency=medium

   * Build in neuer git-Umgebung
  -- Michael Wagner <michael@wagnertech.de>  Mon, 12 Feb 2018 09:45:25 +0100
 
   * Build in neuer git-Umgebung
  -- Michael Wagner <michael@wagnertech.de>  Mon, 12 Feb 2018 09:45:25 +0100
 

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index b2bff6fb2e7e58873d37478add5594245734fdc5..a6e919d46a75b6923a2e73bf4077d811b7d2fbb8 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -22,6 +22,11 @@ function set_build {
                then
                        tag="0.0-TOP"
                fi
                then
                        tag="0.0-TOP"
                fi

+               tag_paket=${tag%_*}
+               if [ "$tag_paket" != "$paket" ]
+               then
+                       tag="0.0-TOP"
+               fi

                changes=$(git status -s |grep "^ *M") || true
                if test -n "$changes"
                then
                changes=$(git status -s |grep "^ *M") || true
                if test -n "$changes"
                then


@@ -37,6 +42,7 @@ function set_build {
 }
 
 function check_version {
 }
 
 function check_version {

+       

        vline=$(head -1 debian/$paket.changelog)
        vline=${vline%-*}
        clversion=${vline#*(}
        vline=$(head -1 debian/$paket.changelog)
        vline=${vline%-*}
        clversion=${vline#*(}


@@ -45,6 +51,13 @@ function check_version {
                version=$clversion
                return
        fi
                version=$clversion
                return
        fi

+
+       # do no check on a modified git repos
+       if [ "${build: -1}" == "M" ]
+       then
+               return
+       fi
+

        if [ "$clversion" != $version ]
        then
                echo "version mismatch: git: $version, changelog: $clversion"
        if [ "$clversion" != $version ]
        then
                echo "version mismatch: git: $version, changelog: $clversion"


@@ -104,6 +117,9 @@ fi
 
 if [ $configure -eq 1 ]
 then
 
 if [ $configure -eq 1 ]
 then

+       # delete changelog and control
+       rm debian/changelog debian/control || true
+       

        echo "paket=$paket" > debian/rules.pre
 #      shift
        ARCH=""
        echo "paket=$paket" > debian/rules.pre
 #      shift
        ARCH=""


@@ -166,7 +182,8 @@ then
        # copy package control
        if [ -f debian/$paket.control ]
        then
        # copy package control
        if [ -f debian/$paket.control ]
        then

-               cp debian/$paket.control debian/control
+               # proceed
+               echo

        else
                # try old fashoned way
                control=$(find etc -name $paket.control) || true
        else
                # try old fashoned way
                control=$(find etc -name $paket.control) || true


@@ -175,12 +192,12 @@ then
                        echo "warning: control file not found"
                        echo "  this file is necessary for any package production."
                else    
                        echo "warning: control file not found"
                        echo "  this file is necessary for any package production."
                else    

-                       echo "Source: $pwd
+                       echo "Source: $paket

        Section: main
        Priority: optional
        Maintainer: WagnerTech UG <mail@wagnertech.de>
        Section: main
        Priority: optional
        Maintainer: WagnerTech UG <mail@wagnertech.de>

-       " > debian/control
-                       grep -v "Version:" $control |grep -v "Maintainer:" >> debian/control 
+       " > debian/$paket.control
+                       grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 

                fi
        fi
        
                fi
        fi
        


@@ -209,6 +226,7 @@ then
        else
                echo "PACK=version" >> debian/rules.pre
        fi
        else
                echo "PACK=version" >> debian/rules.pre
        fi

+       cp debian/rules.pre debian/setenv.sh

 fi
 
 if [ $compile -eq 1 -a ! -e debian/$paket.build ]
 fi
 
 if [ $compile -eq 1 -a ! -e debian/$paket.build ]


@@ -219,12 +237,14 @@ fi
 if [ $compile -eq 1 ]
 then
        # build artefacts
 if [ $compile -eq 1 ]
 then
        # build artefacts

+       . debian/setenv.sh

        debian/rules build
 fi
 
 if [ $pack -eq 1 ]
 then
        # build package
        debian/rules build
 fi
 
 if [ $pack -eq 1 ]
 then
        # build package

+       . debian/setenv.sh

        debian/rules pack
 fi
 
        debian/rules pack
 fi
 

diff --git a/tools/make/rules b/tools/make/rules
index 9ddc63885194ac0b7bc51e0b1dc5afffa102d986..33e72e34cb6ab2beb54fe47ddc9fc5855445b20a 100755 (executable)
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -62,6 +62,9 @@ copy: debian/$(paket).cp
 debian/tmp/DEBIAN/control: debian/control debian/changelog
        dpkg-gencontrol
 
 debian/tmp/DEBIAN/control: debian/control debian/changelog
        dpkg-gencontrol
 

+debian/control: debian/$(paket).control
+       cp debian/$(paket).control debian/control
+

 debian/changelog: debian/$(paket).changelog debian/rules.pre
        sed "s/%BUILD%/$(build)/" debian/$(paket).changelog > debian/changelog
 #      echo "${pwd} (${build}) unstable; urgency=medium" > debian/changelog
 debian/changelog: debian/$(paket).changelog debian/rules.pre
        sed "s/%BUILD%/$(build)/" debian/$(paket).changelog > debian/changelog
 #      echo "${pwd} (${build}) unstable; urgency=medium" > debian/changelog