Separate the software files in obs temporary directory. Rename some variables and directories.

obs/generic/build-scripts/clean_obs.sh

@@ -3,6 +3,6 @@ set -e
 
 source build-scripts/configuration_information.sh
 
-TMP_DIR=$INITIAL_DIR/tmp/
-TMP_DIR=`realpath -m $TMP_DIR`
-rm -rf $TMP_DIR
+TMP_TARGET=$INITIAL_DIR/obs-tmp/$SOFTWARE_NAME
+TMP_TARGET=`realpath -m $TMP_TARGET`
+rm -rf $TMP_TARGET

obs/generic/build-scripts/configuration_information.sh

@@ -38,7 +38,7 @@ COMPILATION_TEMPLATES_DIR=$INITIAL_DIR/templates/compilation-templates/
 BUILD_DIR=$TARBALL_DIR/build/
 # RUN_BUILDOUT_DIR is where the parts/ directory will be ; formerly BUILD_DIRECTORY
 RUN_BUILDOUT_DIR=$BUILD_DIR/$TARGET_DIR
-DISTRIB_TEMPLATES_DIR=$INITIAL_DIR/templates/default-distribution-templates
+DISTRIB_TEMPLATES_DIR=$INITIAL_DIR/templates/distribution-templates
 DISTRIB_FILES_DIR=$INITIAL_DIR/distribution-specifics/$SOFTWARE_NAME
 
 

obs/generic/build-scripts/obs.sh

@@ -4,11 +4,11 @@ set -e
 source build-scripts/configuration_information.sh
 
 # temporary directory for the files needed by OBS
-TMP_DIR=$INITIAL_DIR/tmp/
-TMP_DIR=`realpath -m $TMP_DIR`
-echo TMP_DIR = $TMP_DIR
+TMP_TARGET=$INITIAL_DIR/obs-tmp/$SOFTWARE_NAME
+TMP_TARGET=`realpath -m $TMP_TARGET`
+echo TMP_TARGET = $TMP_TARGET
 
-# copy the Makefile at the root of the tarball
+# copy the generated Makefile at the root of the tarball
 cp $COMPILATION_TEMPLATES_DIR/tmp/$SOFTWARE_NAME/Makefile $TARBALL_DIR/Makefile
 # save the local TARBALL_DIR to replace it with the TARBALL_DIR of OBS' VM
 echo $TARBALL_DIR > $TARBALL_DIR/local_build_directory
@@ -20,15 +20,15 @@ mv $RUN_BUILDOUT_DIR/bin/backup.buildout $RUN_BUILDOUT_DIR/bin/buildout
 rm -rf $RUN_BUILDOUT_DIR/{.installed.cfg,parts/}
 
 ## prepare the files for OBS
-mkdir -p $TMP_DIR
+mkdir -p $TMP_TARGET
 # -C option allows to give tar an absolute path without archiving the directory from / (i.e. home/user/[...])
-tar czf $TMP_DIR/${SOFTWARE_AND_VERSION}${ARCHIVE_EXT} -C $INITIAL_DIR/tarballs/ $SOFTWARE_AND_VERSION/
-tar czf $TMP_DIR/debian.tar.gz -C $DIST_DIR/ debian/
-cp $DIST_DIR/*.dsc $TMP_DIR/
+tar czf $TMP_TARGET/${SOFTWARE_AND_VERSION}${ARCHIVE_EXT} -C $INITIAL_DIR/tarballs/ $SOFTWARE_AND_VERSION/
+tar czf $TMP_TARGET/debian.tar.gz -C $DIST_DIR/ debian/
+cp $DIST_DIR/*.dsc $TMP_TARGET/
 # move the files for OBS
-cp $TMP_DIR/${SOFTWARE_AND_VERSION}${ARCHIVE_EXT} $OBS_DIR
-cp $TMP_DIR/debian.tar.gz $OBS_DIR
-cp $TMP_DIR/*.dsc $OBS_DIR
+cp $TMP_TARGET/${SOFTWARE_AND_VERSION}${ARCHIVE_EXT} $OBS_DIR
+cp $TMP_TARGET/debian.tar.gz $OBS_DIR
+cp $TMP_TARGET/*.dsc $OBS_DIR
 
 cd $OBS_DIR
 osc commit

obs/generic/templates/default-distribution-templates/debian_default/control.in → obs/generic/templates/distribution-templates/debian_default/control.in

@@ -6,7 +6,7 @@ Build-Depends: debhelper,
                chrpath,
                python
 
-Package: mca
+Package: %SOFTWARE_NAME%
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},