Commit 7be559de authored by Markus Frosch's avatar Markus Frosch
Browse files

Update diff script

parent df941186
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
## Snapshot Artifacts ## Snapshot Artifacts
/*.git/ /*.git/
/.debian_packaging/
## Editors ## Editors
*~ *~
......
...@@ -6,7 +6,7 @@ cd "$(readlink -f "$(dirname "$0")")" ...@@ -6,7 +6,7 @@ cd "$(readlink -f "$(dirname "$0")")"
target="${1%/}" target="${1%/}"
branch="$target" branch="$target"
debian_git=https://anonscm.debian.org/git/pkg-nagios/pkg-icinga2.git debian_git=https://salsa.debian.org/nagios-team/pkg-icinga2.git
case "$target" in case "$target" in
jessie|wheezy) jessie|wheezy)
...@@ -42,8 +42,8 @@ echo "# Branch: $branch" ...@@ -42,8 +42,8 @@ echo "# Branch: $branch"
echo "#" echo "#"
# check version # check version
version_here=`dpkg-parsechangelog -S Version -l "$target"/debian/changelog` version_here=$(dpkg-parsechangelog -S Version -l "$target"/debian/changelog)
version_debian=`dpkg-parsechangelog -S Version -l .debian_packaging/debian/changelog` version_debian=$(dpkg-parsechangelog -S Version -l .debian_packaging/debian/changelog)
if dpkg --compare-versions "$version_debian" gt "$version_here" if dpkg --compare-versions "$version_debian" gt "$version_here"
then then
...@@ -57,4 +57,4 @@ echo "# You can update the version with the following command:" ...@@ -57,4 +57,4 @@ echo "# You can update the version with the following command:"
echo "# dch --changelog $target/debian/changelog --newversion '$version_debian' --distribution 'icinga-$target'" echo "# dch --changelog $target/debian/changelog --newversion '$version_debian' --distribution 'icinga-$target'"
echo "#" echo "#"
diff -Naur -x "changelog" "$target"/debian/ .debian_packaging/debian/ diff --color=auto -Naur -x "changelog" "$target"/debian/ .debian_packaging/debian/
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment