X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fmake-gosa-package;h=297eb5920bc2e62a5fd6f753728caa1580c83d72;hb=e488772123d2b0ee56ebd92c95880576f27aea62;hp=2d826ef6837fac7e7ffbeb0c70bc5b4a164fc664;hpb=c24abf1e4216c3cea0eff19346e6c7da1a346e47;p=gosa.git diff --git a/gosa-core/contrib/make-gosa-package b/gosa-core/contrib/make-gosa-package index 2d826ef68..297eb5920 100755 --- a/gosa-core/contrib/make-gosa-package +++ b/gosa-core/contrib/make-gosa-package @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # This code is part of GOsa (http://www.gosa-project.org) # Copyright (C) 2008 GONICUS GmbH # @@ -111,11 +111,13 @@ then BRANCH_REV=$(LANG=C svn info gosa-info | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p') rm -rf gosa-info - echo "Loading svn information for goto '${BRANCH}'..." - svn co -N https://oss.gonicus.de/repositories/goto/${BRANCH} goto-info/ > /dev/null - GOTO_BRANCH_REV=$(LANG=C svn info goto-info | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p') - rm -rf goto-info - + if [ "$GOTO" = "use" ] + then + echo "Loading svn information for goto '${BRANCH}'..." + svn co -N https://oss.gonicus.de/repositories/goto/${BRANCH} goto-info/ > /dev/null + GOTO_BRANCH_REV=$(LANG=C svn info goto-info | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p') + rm -rf goto-info + fi else echo "Loading svn information for gosa '${BRANCH}' from local checkout ..." BRANCH_REV=$(LANG=C svn info $EXTRACT/gosa-core | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p') @@ -248,6 +250,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 +263,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}'..."