From a29a81a1ad37840c0f2305ef5bbba6b81e372b64 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario@localhost.localdomain>
Date: Wed, 24 May 2017 11:29:46 +0200
Subject: [PATCH] Bump
---
debian/changelog | 7 +++++++
debian/patches/00list | 2 --
..._fix_livestatus.dpatch => 01_fix_livestatus.patch} | 7 -------
.../{02_wato-sudoers.dpatch => 02_wato-sudoers.patch} | 7 -------
debian/patches/series | 2 ++
debian/rules | 11 -----------
debian/source/format | 2 +-
7 files changed, 10 insertions(+), 28 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_livestatus.dpatch => 01_fix_livestatus.patch} (73%)
rename debian/patches/{02_wato-sudoers.dpatch => 02_wato-sudoers.patch} (85%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 09e0e09..ba26721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+check-mk (1.2.8p22-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * change to quilt patches
+
+ -- Mario Fetka <mario.fetka@gmail.com> Wed, 24 May 2017 11:04:22 +0200
+
check-mk (1.2.8p16-1) unstable; urgency=medium
* new upstream release
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ff257cd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_livestatus
-02_wato-sudoers
diff --git a/debian/patches/01_fix_livestatus.dpatch b/debian/patches/01_fix_livestatus.patch
similarity index 73%
rename from debian/patches/01_fix_livestatus.dpatch
rename to debian/patches/01_fix_livestatus.patch
index 7262bd2..3f461f2 100644
--- a/debian/patches/01_fix_livestatus.dpatch
+++ b/debian/patches/01_fix_livestatus.patch
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_livestatus.dpatch by Alexander Wirt <formorer@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-check_mk~/setup.sh pkg-check_mk/setup.sh
--- pkg-check_mk~/setup.sh 2011-05-28 13:21:38.000000000 +0200
+++ pkg-check_mk/setup.sh 2011-05-28 13:22:09.662237441 +0200
diff --git a/debian/patches/02_wato-sudoers.dpatch b/debian/patches/02_wato-sudoers.patch
similarity index 85%
rename from debian/patches/02_wato-sudoers.dpatch
rename to debian/patches/02_wato-sudoers.patch
index fceab98..47be22b 100644
--- a/debian/patches/02_wato-sudoers.dpatch
+++ b/debian/patches/02_wato-sudoers.patch
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## wato-sudoers-location.dpatch by Bernd Zeimetz <bzed@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install WATO sudoers line into /etc/sudoers.d/check_mk_WATO
-
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-check-mk~/setup.sh pkg-check-mk/setup.sh
--- pkg-check-mk~/setup.sh 2013-08-07 11:44:12.000000000 +0200
+++ pkg-check-mk/setup.sh 2013-08-07 11:47:40.344748346 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..893d381
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_fix_livestatus.patch
+02_wato-sudoers.patch
diff --git a/debian/rules b/debian/rules
index ad56d0e..b425d71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,16 +158,5 @@ binary-arch: build install
dh_md5sums -a
dh_builddeb -a
-patch: patch-stamp
-patch-stamp:
- @echo "Doing $@"
- dpatch --with-cpp apply-all
- dpatch --with-cpp cat-all >patch-stamp
-
-unpatch:
- @echo "Doing $@"
- dpatch --with-cpp deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)