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

New upstream version 1.4.0

parent c88ef19b
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.3.4 Version: 1.4.0
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
......
...@@ -45,6 +45,15 @@ do ...@@ -45,6 +45,15 @@ do
-p|--patch) -p|--patch)
export PATCH=YES export PATCH=YES
;; ;;
-pb|--pbuilder)
export PBUILDER=YES
;;
-cpb|--createpb)
export CREATEPB=YES
;;
-a=*|--arch=*)
export ARCH="${i#*=}"
;;
-c|--continue) -c|--continue)
export CONTINUE=YES export CONTINUE=YES
;; ;;
...@@ -66,7 +75,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then ...@@ -66,7 +75,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then
echo "Error: PACKAGE variable is not defined" echo "Error: PACKAGE variable is not defined"
fi fi
if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then
echo "pidpbuild version 1.3.4" echo "pidpbuild version 1.4.0"
echo "" echo ""
echo "usage: pidpbuild [<TARBALL>] [-v=<VERSION>] [-ns|--no-signature]" echo "usage: pidpbuild [<TARBALL>] [-v=<VERSION>] [-ns|--no-signature]"
echo " [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]" echo " [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]"
...@@ -92,6 +101,9 @@ if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then ...@@ -92,6 +101,9 @@ if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then
echo " -m, --merge upstream/* merged into debian/*" echo " -m, --merge upstream/* merged into debian/*"
echo " by default: replace is performed" echo " by default: replace is performed"
echo " -p, --patch the patching procedure" echo " -p, --patch the patching procedure"
echo " -pb, --pbuilder use git-pbuilder"
echo " --cpb, --createpb create git-pbuilder environment"
echo " -a=, --arch= git-pbuilder architecture"
echo " -c, --continue continue the built of the debian package, e.g.:" echo " -c, --continue continue the built of the debian package, e.g.:"
echo " after a conflict detected between patches " echo " after a conflict detected between patches "
echo " and the new source tarball or " echo " and the new source tarball or "
...@@ -131,6 +143,12 @@ else ...@@ -131,6 +143,12 @@ else
echo " DEBFULLNAME=\"$DEBFULLNAME\"" echo " DEBFULLNAME=\"$DEBFULLNAME\""
echo " DEBEMAIL=\"$DEBEMAIL\"" echo " DEBEMAIL=\"$DEBEMAIL\""
echo "" echo ""
if ! [[ -z $PBUILDER ]] ; then
if [[ -z $CREATEPB ]] ; then
DIST=$RELEASE git-pbuilder update
else
DIST=$RELEASE git-pbuilder create
fi
if [[ -z $VERSION ]] ; then if [[ -z $VERSION ]] ; then
RE='^[0-9]+$' RE='^[0-9]+$'
read -r FIRSTLINE < debian/changelog read -r FIRSTLINE < debian/changelog
...@@ -260,9 +278,20 @@ else ...@@ -260,9 +278,20 @@ else
fi fi
git clean -f -d git clean -f -d
if [[ -z $NOSIGNATURE ]] ; then if [[ -z $NOSIGNATURE ]] ; then
gbp buildpackage --git-tag if [[ -z $PBUILDER ]] ; then
gbp buildpackage --git-tag
else
gbp buildpackage --git-tag --git-pbuilder --git-dist=$RELEASE
lintian
debsign
fi
else else
gbp buildpackage -us -uc --git-tag if [[ -z $PBUILDER ]] ; then
gbp buildpackage -us -uc --git-tag
else
gbp buildpackage --git-tag --git-pbuilder --git-dist=$RELEASE
lintian
fi
fi fi
if [[ ! -z $PIDTOKILL ]] ; then if [[ ! -z $PIDTOKILL ]] ; then
(sleep 1 && kill -TERM $PPID $PIDTOKILL &) (sleep 1 && kill -TERM $PPID $PIDTOKILL &)
......
...@@ -59,7 +59,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then ...@@ -59,7 +59,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then
echo "Error: PACKAGE variable is not defined" echo "Error: PACKAGE variable is not defined"
fi fi
if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then
echo "pidpclone version 1.3.4" echo "pidpclone version 1.4.0"
echo "" echo ""
echo "usage: pidpclone <DEB-PACKAGE-NAME> [-p|--patch] [-u=<USER>] [-h|--help]" echo "usage: pidpclone <DEB-PACKAGE-NAME> [-p|--patch] [-u=<USER>] [-h|--help]"
echo " [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv] " echo " [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv] "
...@@ -120,17 +120,17 @@ else ...@@ -120,17 +120,17 @@ else
git fetch --all git fetch --all
if [[ $(git checkout -b upstream/$RELEASE origin/upstream/$RELEASE > /dev/null 2>&1) && $? ]]; then if [[ $(git checkout -b upstream/$RELEASE origin/upstream/$RELEASE > /dev/null 2>&1) && $? ]]; then
git checkout upstream/$RELEASE git checkout upstream/$RELEASE
git pull origin upstream/$RELEASE || true git pull origin upstream/$RELEASE
fi fi
if [[ $(git checkout -b pristine-tar origin/pristine-tar > /dev/null 2>&1) && $? ]]; then if [[ $(git checkout -b pristine-tar origin/pristine-tar > /dev/null 2>&1) && $? ]]; then
git checkout pristine-tar git checkout pristine-tar
git pull origin pristine-tar || true git pull origin pristine-tar
fi fi
if [[ $(git checkout -b debian/$RELEASE origin/debian/$RELEASE > /dev/null 2>&1) && $? ]]; then if [[ $(git checkout -b debian/$RELEASE origin/debian/$RELEASE > /dev/null 2>&1) && $? ]]; then
git pull origin debian/$RELEASE || true git pull origin debian/$RELEASE
else else
git checkout debian/$RELEASE git checkout debian/$RELEASE
git pull origin debian/$RELEASE || true git pull origin debian/$RELEASE
fi fi
git clean -f -d git clean -f -d
git commit -a -m 'clean the repository' > /dev/null 2>&1 || true git commit -a -m 'clean the repository' > /dev/null 2>&1 || true
......
...@@ -70,7 +70,7 @@ if [[ ! -z $HELP ]] && [[ -z $TARBALL ]] ; then ...@@ -70,7 +70,7 @@ if [[ ! -z $HELP ]] && [[ -z $TARBALL ]] ; then
echo "Error: TARBALL variable is not defined" echo "Error: TARBALL variable is not defined"
fi fi
if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] || [[ -z $TARBALL ]] ; then if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] || [[ -z $TARBALL ]] ; then
echo "pidpbuild version 1.3.4" echo "pidpbuild version 1.4.0"
echo "" echo ""
echo "usage: pidpcreate <DEB-PACKAGE-NAME> <TARBALL> [-v=<SRCVERSION>] [-ns|--no-signature]" echo "usage: pidpcreate <DEB-PACKAGE-NAME> <TARBALL> [-v=<SRCVERSION>] [-ns|--no-signature]"
echo " [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]" echo " [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]"
......
...@@ -45,7 +45,7 @@ if [[ ! -z $HELP ]] && [[ -z $DEBPACKAGE ]] ; then ...@@ -45,7 +45,7 @@ if [[ ! -z $HELP ]] && [[ -z $DEBPACKAGE ]] ; then
echo "Error: DEB-PACKAGE-NAME argument is not defined" echo "Error: DEB-PACKAGE-NAME argument is not defined"
fi fi
if [[ ! -z $HELP ]] || [[ -z $DEBPACKAGE ]] ; then if [[ ! -z $HELP ]] || [[ -z $DEBPACKAGE ]] ; then
echo "pidppush version 1.3.4" echo "pidppush version 1.4.0"
echo "" echo ""
echo "usage: pidppush <DEB-PACKAGE-NAME> " echo "usage: pidppush <DEB-PACKAGE-NAME> "
echo "" echo ""
......
...@@ -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.3.4' release = '1.4.0'
#: (: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