Added "--no-break" to help etch builds

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14887 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/make-gosa-package b/gosa-core/contrib/make-gosa-package
index 2d826ef6837fac7e7ffbeb0c70bc5b4a164fc664..7dc77bb38d3e979a62fbd509075930c9721a2536 100755 (executable)
--- a/gosa-core/contrib/make-gosa-package
+++ b/gosa-core/contrib/make-gosa-package
@@ -248,6 +248,10 @@ if [ -z "$MAKE_PLUGINS" ]; then
        done
 fi
 
+if [ "TARGET_RELEASE" == "etch" ]; then
+  NOBREAKS="--no-break"
+fi
+
 for plugin in $MAKE_PLUGINS; do
 
        GOSA_PLUG_DIR="gosa-plugin-$plugin-${GOSA_VER}"
@@ -257,7 +261,7 @@ for plugin in $MAKE_PLUGINS; do
        mv "gosa-plugins-${BNAME}/$plugin" .
 
        echo "Debianizing plugin $plugin"
-       yes | dh-make-gosa --section $SECTION $plugin
+       yes | dh-make-gosa $NOBREAKS --section $SECTION $plugin
        rm -rf "$plugin"
 
        echo "Packing original sources 'gosa-plugin-$plugin-${GOSA_VER}'..."

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index fb942470fb27b1ec75b9f03008758f3ada664cff..4761074c255bd6d02fa5ad5e599589672c968069 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 usage() {
-  echo "Usage: ${0##*/} [--section section name] [-b|--branch branch] [-e|--email mail] [--depends] plugin-dir|plugin.tar.gz" >&2
+  echo "Usage: ${0##*/} [--no-break] [--section section name] [-b|--branch branch] [-e|--email mail] [--depends] plugin-dir|plugin.tar.gz" >&2
   exit 1
 }
 
@@ -80,6 +80,7 @@ eval set -- "$TEMP"
 RELEASE=trunk
 DOWNLOAD=
 DEPENDS=
+NOBREAK=
 SECTION=web
 DEST=
 while true; do
@@ -99,6 +100,9 @@ while true; do
     --section)  SECTION="$2"
                 shift 2
                 ;;
+    --no-break) NOBREAK=1
+                shift 1
+                ;;
     --dest)     DEST=$2/
                 shift 2
                 ;;
@@ -248,7 +252,9 @@ fi
 if [ "$PL_CONFLICTS" ]; then
        sed -i "11iConflicts: $PL_CONFLICTS" debian/control
 fi
-sed -i "12iBreaks: gosa (<2.6)" debian/control
+if [ -z "$NOBREAK" ]; then
+  sed -i "12iBreaks: gosa (<2.6)" debian/control
+fi
 sed -i 's/^\(Build-Depends: .*\)$/\1, dpatch/g' debian/control
 sed -i 's/^Standards-Version: 3.7.3/Standards-Version: 3.8.3/g' debian/control