Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
deb-icinga2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
packaging
deb-icinga2
Commits
6a57ed58
Commit
6a57ed58
authored
7 years ago
by
Markus Frosch
Browse files
Options
Downloads
Patches
Plain Diff
icinga2: Add diff tool
parent
1bbf02b2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
diff
+60
-0
60 additions, 0 deletions
diff
with
61 additions
and
0 deletions
.gitignore
0 → 100644
+
1
−
0
View file @
6a57ed58
/.debian_packaging/
This diff is collapsed.
Click to expand it.
diff
0 → 100755
+
60
−
0
View file @
6a57ed58
#!/bin/bash
set
-e
cd
"
$(
readlink
-f
"
$(
dirname
"
$0
"
)
"
)
"
target
=
"
${
1
%/
}
"
branch
=
"
$target
"
debian_git
=
https://anonscm.debian.org/git/pkg-nagios/pkg-icinga2.git
case
"
$target
"
in
jessie|wheezy
)
branch
=
"debmon-
$target
"
;;
stretch
)
branch
=
master
;;
ubuntu
)
;;
*
)
echo
"Please specify what to diff, target '
$target
' is unknown!"
>
&2
exit
1
;;
esac
if
[
!
-d
.debian_packaging
]
;
then
git clone
-q
"
$debian_git
"
.debian_packaging/
else
(
cd
.debian_packaging
&&
git fetch
)
fi
(
cd
.debian_packaging/
git clean
-qfdx
git checkout
-fq
"
$branch
"
git pull
-q
)
echo
"# Diffing from Debian packaging"
echo
"# GIT Url:
$debian_git
"
echo
"# Branch:
$branch
"
echo
"#"
# check version
version_here
=
`
dpkg-parsechangelog
-S
Version
-l
"
$target
"
/debian/changelog
`
version_debian
=
`
dpkg-parsechangelog
-S
Version
-l
.debian_packaging/debian/changelog
`
if
dpkg
--compare-versions
"
$version_debian
"
gt
"
$version_here
"
then
echo
"# NEWER VERSION ON DEBIAN!"
>
&2
fi
echo
"# Icinga version:
$version_here
"
echo
"# Debian version:
$version_debian
"
echo
"#"
echo
"# You can update the version with the following command:"
echo
"# dch --changelog
$target
/debian/changelog --newversion '
$version_debian
' --distribution 'icinga-
$target
'"
echo
"#"
diff
-Naur
-x
"changelog"
.debian_packaging/debian/
"
$target
"
/debian/
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment