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

Updated version 1.5.9 from 'upstream/jessie/1.5.9'

with Debian dir 4367ed1d763d56a4caad4c34452deb6a2c4c8e1f
parents ce46c6a9 6e33c4fb
No related branches found
No related tags found
No related merge requests found
Metadata-Version: 1.0
Name: pidp.tools
Version: 1.5.8
Version: 1.5.9
Summary: PETRA III Debian Package Tools
Home-page: https://stash.desy.de/projects/JMK/repos/pidptools/browse/
Author: Jan Kotanski
......
......@@ -17,7 +17,7 @@
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
#
set -e
PIDPVERSION="1.5.8"
PIDPVERSION="1.5.9"
for i in "${@:1}"
do
if [[ $i == -* ]] ; then
......@@ -315,20 +315,23 @@ else
fi
fi
else
MGITFILES=$(ls `git rev-parse --git-dir`)
if [[ -d "debian/patches" ]] ; then
if [[ "$(ls -A debian/patches)" ]] ; then
git rebase --continue
if ! [[ $? -eq 0 ]]; then
echo "Conflict between tarball and patches"
echo "1) Correct the source files or/and patches"
echo "2) Stage your changes, i.e. with git add ..."
echo "3) Execute \"pidpbuild --continue\""
exit 1
fi
gbp pq export
git add debian/patches || true
if [[ $(git diff --cached --exit-code) && $? ]] ; then
git commit
if [[ $MGITFILES == *"rebase"* ]]; then
git rebase --continue
if ! [[ $? -eq 0 ]]; then
echo "Conflict between tarball and patches"
echo "1) Correct the source files or/and patches"
echo "2) Stage your changes, i.e. with git add ..."
echo "3) Execute \"pidpbuild --continue\""
exit 1
fi
gbp pq export
git add debian/patches || true
if [[ $(git diff --cached --exit-code) && $? ]] ; then
git commit
fi
fi
fi
fi
......
......@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
#
PIDPVERSION="1.5.8"
PIDPVERSION="1.5.9"
for i in "${@:1}"
do
if [[ $i == -* ]] ; then
......
......@@ -17,7 +17,7 @@
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
#
set -e
PIDPVERSION="1.5.8"
PIDPVERSION="1.5.9"
for i in "${@:1}"
do
if [[ $i == -* ]] ; then
......
......@@ -17,7 +17,7 @@
# along with nexdatas. If not, see <http://www.gnu.org/licenses/>.
#
PIDPVERSION="1.5.8"
PIDPVERSION="1.5.9"
for i in "${@:1}"
do
if [[ $i == -* ]] ; then
......
......@@ -30,7 +30,7 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
#: (:obj:`str`) full release number
release = "1.5.8"
release = "1.5.9"
#: (:obj:`dict` <:obj:`str` , any >`) metadata for distutils
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