posaune

diff --git a/debian/mbuild.cp b/debian/mbuild.cp
index 9e8f3b8f9c8e9e316e1434e791346cdde85d7e8e..1421fb3c8d2249defc185d5a66ac3fae76f41c86 100755 (executable)
--- a/debian/mbuild.cp
+++ b/debian/mbuild.cp
@@ -6,7 +6,7 @@ base=$1
 mkdir -p $base/usr/bin/
 cp tools/make/mconfigure $base/usr/bin/
 cp tools/make/treecopy $base/usr/bin/
-cp tools/make/make-conffile $base/usr/bin/
+cp tools/make/create-conffiles $base/usr/bin/
 
 mkdir -p $base/usr/share/mbuild/
 cp tools/make/rules $base/usr/share/mbuild/

diff --git a/doc/mbuild.8 b/doc/mbuild.8
index b1d4ef63c03e4048f0d74630e19d3fe4e2cc784b..4b57e029c17ecb5a6686f48bc99b2711d003be0f 100644 (file)
--- a/doc/mbuild.8
+++ b/doc/mbuild.8
@@ -57,10 +57,11 @@ file are needed in the debian directory. If pre/post installation scripts
 are needed, these files must be also placed in the
 .B debian 
 directory.
-.br
+
 A standard copyright file is included. An user defined file can be used by copying it to debian/copyright
 in the PAKET.prepare script.
-.br
+
+If files are present to be placed unter /etc a conffiles is creates to avoid changes made by the administrator.
 
 .SH FILES
 .TP

diff --git a/tools/make/create-conffiles b/tools/make/create-conffiles
index 54567f9b0f98b8d53cfe070c34b8f491820b984e..258a3505877f00aa8a623c13e2b60392a4543b60 100755 (executable)
--- a/tools/make/create-conffiles
+++ b/tools/make/create-conffiles
@@ -7,8 +7,11 @@ if [ $# -ne 1 ]; then
 fi
 
 cd $1
-mkdir -p DEBIAN
-for files in $(find etc -type f); do
-       echo "/$files" >> DEBIAN/conffiles
-done
+if [ -d etc ]
+then
+       mkdir -p DEBIAN
+       for files in $(find etc -type f); do
+               echo "/$files" >> DEBIAN/conffiles
+       done
+fi
 

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index e5f11b342805521fb34eb7d82c5bc43041dac8c9..244d19b17c6dde26ef218fb1d63516b91064ed56 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -249,7 +249,7 @@ then
 #      pwd=${pwd,,*}
 #      echo "pwd=$pwd" >> debian/rules.pre
 
-       echo "building $paket with build $version-$build"
+       echo "building $paket with version/build=$version-$build"
 
        pushd debian >/dev/null
        # ./debian -------------------------------------
@@ -355,7 +355,7 @@ then
                        echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
                        echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
                fi
-               if ! [ -f $paket.changelog ]
+               if ! [ -f debian/$paket.changelog ]
                then
                        echo "changelog_source = debian/default.changelog" >> debian/rules.pre
                        if [ -f debian/default.changelog ]

diff --git a/tools/make/rules b/tools/make/rules
index 6b7d6889f696fa25850714d8ccd28a985cddff07..bd3cf572073d1f384f3adb7cadc406da4022bb20 100755 (executable)
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -9,7 +9,7 @@ INSERT_BUILD = /usr/share/mbuild/insert_build.sh
 RSYNC_OPT = -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude="*Aktuell" --exclude=".*"
 
 std_inst_tgt = debian/tmp/usr/share/doc/$(paket)/copyright debian/tmp/usr/share/doc/$(paket)/README.debian
-changelog_source = $(paket).changelog
+changelog_source = debian/$(paket).changelog
 
 include debian/rules.pre