Skip to content
Snippets Groups Projects
Commit 86a7d12b authored by Jan Kotanski's avatar Jan Kotanski
Browse files

Updated version 1.5.2 from 'upstream/jessie/1.5.2'

with Debian dir 68aaa0295161d08a42f570c3345fcf934f50c906
parents f4826b1e 6a4d04ae
No related branches found
No related tags found
No related merge requests found
Metadata-Version: 1.0 Metadata-Version: 1.0
Name: pidp.tools Name: pidp.tools
Version: 1.5.1 Version: 1.5.2
Summary: PETRA III Debian Package Tools Summary: PETRA III Debian Package Tools
Home-page: https://stash.desy.de/projects/JMK/repos/pidptools/browse/ Home-page: https://stash.desy.de/projects/JMK/repos/pidptools/browse/
Author: Jan Kotanski Author: Jan Kotanski
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>. # along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
# #
set -e set -e
PIDPVERSION="1.5.1" PIDPVERSION="1.5.2"
for i in "${@:1}" for i in "${@:1}"
do do
if [[ $i == -* ]] ; then if [[ $i == -* ]] ; then
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>. # along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
# #
PIDPVERSION="1.5.1" PIDPVERSION="1.5.2"
for i in "${@:1}" for i in "${@:1}"
do do
if [[ $i == -* ]] ; then if [[ $i == -* ]] ; then
...@@ -136,11 +136,12 @@ else ...@@ -136,11 +136,12 @@ else
git fetch --all git fetch --all
if ! [[ -z $TEMPRELEASE ]] ; then if ! [[ -z $TEMPRELEASE ]] ; then
echo "TEMPLATE RELEASE: $TEMPRELEASE" echo "TEMPLATE RELEASE: $TEMPRELEASE"
if [[ $(git checkout -b upstream/$TEMPRELEASE origin/upstream/$TEMPRELEASE > /dev/null 2>&1) && $? ]]; then set +e
git checkout upstream/$TEMPRELEASE git checkout -b upstream/$TEMPRELEASE origin/upstream/$TEMPRELEASE
if [[ -z $NOPULL ]] ; then set -e
git pull origin upstream/$TEMPRELEASE git checkout upstream/$TEMPRELEASE
fi if [[ -z $NOPULL ]] ; then
git pull origin upstream/$TEMPRELEASE
fi fi
git checkout -b upstream/$RELEASE git checkout -b upstream/$RELEASE
TEMPTAGS=(`git tag | grep upstream/$TEMPRELEASE`) TEMPTAGS=(`git tag | grep upstream/$TEMPRELEASE`)
...@@ -154,22 +155,19 @@ else ...@@ -154,22 +155,19 @@ else
done done
# git config branch.upstream/$RELEASE.remote origin # git config branch.upstream/$RELEASE.remote origin
# git config branch.upstream/$RELEASE.merge refs/heads/upstream/$RELEASE # git config branch.upstream/$RELEASE.merge refs/heads/upstream/$RELEASE
if [[ $(git checkout -b pristine-tar origin/pristine-tar > /dev/null 2>&1) && $? ]]; then set +e
git checkout pristine-tar git checkout -b pristine-tar origin/pristine-tar
if [[ -z $NOPULL ]] ; then set -e
git pull origin pristine-tar git checkout pristine-tar
fi if [[ -z $NOPULL ]] ; then
git pull origin pristine-tar
fi fi
if [[ $(git checkout -b debian/$TEMPRELEASE origin/debian/$TEMPRELEASE > /dev/null 2>&1) && $? ]]; then set +e
if [[ -z $NOPULL ]] ; then git checkout -b debian/$TEMPRELEASE origin/debian/$TEMPRELEASE
git pull origin debian/$TEMPRELEASE set -e
fi git checkout debian/$TEMPRELEASE
else if [[ -z $NOPULL ]] ; then
git checkout debian/$TEMPRELEASE git pull origin debian/$TEMPRELEASE
if [[ -z $NOPULL ]] ; then
git pull origin debian/$TEMPRELEASE
fi
fi fi
git checkout -b debian/$RELEASE git checkout -b debian/$RELEASE
TEMPTAGS=(`git tag | grep debian/$TEMPRELEASE`) TEMPTAGS=(`git tag | grep debian/$TEMPRELEASE`)
...@@ -183,27 +181,26 @@ else ...@@ -183,27 +181,26 @@ else
# git config branch.debian/$RELEASE.remote origin # git config branch.debian/$RELEASE.remote origin
# git config branch.debian/$RELEASE.merge refs/heads/debian/$RELEASE # git config branch.debian/$RELEASE.merge refs/heads/debian/$RELEASE
else else
if [[ $(git checkout -b upstream/$RELEASE origin/upstream/$RELEASE > /dev/null 2>&1) && $? ]]; then set +e
git checkout upstream/$RELEASE git checkout -b upstream/$RELEASE origin/upstream/$RELEASE
if [[ -z $NOPULL ]] ; then set -e
git pull origin upstream/$RELEASE git checkout upstream/$RELEASE
fi if [[ -z $NOPULL ]] ; then
git pull origin upstream/$RELEASE
fi fi
if [[ $(git checkout -b pristine-tar origin/pristine-tar > /dev/null 2>&1) && $? ]]; then set +e
git checkout pristine-tar git checkout -b pristine-tar origin/pristine-tar
if [[ -z $NOPULL ]] ; then set -e
git pull origin pristine-tar git checkout pristine-tar
fi if [[ -z $NOPULL ]] ; then
git pull origin pristine-tar
fi fi
if [[ $(git checkout -b debian/$RELEASE origin/debian/$RELEASE > /dev/null 2>&1) && $? ]]; then set +e
if [[ -z $NOPULL ]] ; then git checkout -b debian/$RELEASE origin/debian/$RELEASE
git pull origin debian/$RELEASE set -e
fi git checkout debian/$RELEASE
else if [[ -z $NOPULL ]] ; then
git checkout debian/$RELEASE git pull origin debian/$RELEASE
if [[ -z $NOPULL ]] ; then
git pull origin debian/$RELEASE
fi
fi fi
fi fi
git clean -f -d git clean -f -d
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>. # along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
# #
set -e set -e
PIDPVERSION="1.5.1" PIDPVERSION="1.5.2"
for i in "${@:1}" for i in "${@:1}"
do do
if [[ $i == -* ]] ; then if [[ $i == -* ]] ; then
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>. # along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
# #
PIDPVERSION="1.5.1" PIDPVERSION="1.5.2"
for i in "${@:1}" for i in "${@:1}"
do do
if [[ $i == -* ]] ; then if [[ $i == -* ]] ; then
......
...@@ -30,7 +30,7 @@ def read(fname): ...@@ -30,7 +30,7 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read() return open(os.path.join(os.path.dirname(__file__), fname)).read()
#: (:obj:`str`) full release number #: (:obj:`str`) full release number
release = "1.5.1" release = "1.5.2"
#: (:obj:`dict` <:obj:`str` , any >`) metadata for distutils #: (:obj:`dict` <:obj:`str` , any >`) metadata for distutils
SETUPDATA = dict( SETUPDATA = dict(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment