[Debian-ha-commits] [crmsh] 03/05: Import new upstream version 2.2.1.

[Adrian Vondendriesch]

This is an automated email from the git hooks/post-receive script.

discostu-guest pushed a commit to branch master
in repository crmsh.

commit b9fa0bf4b649a99f25c7ae5270e0d7dbee3b41ac
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Tue May 3 20:15:16 2016 +0200

    Import new upstream version 2.2.1.
    
    * Drop patches merged upstream.
    * Add myself to uploaders.
---
 debian/changelog                                   | 10 +++++++
 debian/control                                     |  3 ++-
 ...Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch | 28 -------------------
 debian/patches/0002-Remove-fix-for-Debian.patch    | 31 ----------------------
 debian/patches/series                              |  2 --
 5 files changed, 12 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6323982..162a1ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+crmsh (2.2.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * patches:
+    - drop 0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
+    - drop 0002-Remove-fix-for-Debian.patch
+  * Add myself to uploaders.
+
+ -- Adrian Vondendriesch <adrian.vondendriesch at credativ.de>  Tue, 03 May 2016 20:05:28 +0200
+
 crmsh (2.2.0-1) unstable; urgency=high
 
   [ Richard B Winters ]
diff --git a/debian/control b/debian/control
index 8af2629..16dd0b4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: extra
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>,
  Richard B Winters <rik at mmogp.com>,
- Christoph Berg <myon at debian.org>
+ Christoph Berg <myon at debian.org>,
+ Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
 Build-Depends: debhelper (>= 9.0.0),
  asciidoc,
  autotools-dev,
diff --git a/debian/patches/0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch b/debian/patches/0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
deleted file mode 100644
index c83898a..0000000
--- a/debian/patches/0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Fri, 29 Jan 2016 10:38:09 -0500
-Subject: Remove AM_CONDITIONAL for UNAME_IS_DEBIAN
-
- - The conditional was implemented as part of a 
-   resolution for a packaging issue on Debian systems, 
-   but is not necessary
- - This patch was forwarded and merged upstream
-
-Change-Id: I3f41fb84c5fabe446154bcc6236703b8294dd832
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f378f26..1a8de80 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,8 +41,6 @@ dnl command line
- dnl Wrap in m4_ifdef to avoid breaking on older platforms
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
- 
--AM_CONDITIONAL([UNAME_IS_DEBIAN], [test x`uname -v | grep -oh Debian` = x"Debian"])
--
- AC_SUBST(OCF_ROOT_DIR)
- AC_SUBST(CRM_DAEMON_USER)
- 
diff --git a/debian/patches/0002-Remove-fix-for-Debian.patch b/debian/patches/0002-Remove-fix-for-Debian.patch
deleted file mode 100644
index 100992f..0000000
--- a/debian/patches/0002-Remove-fix-for-Debian.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Fri, 29 Jan 2016 10:38:47 -0500
-Subject: Remove fix for Debian
-
- - The fix for Debian is not necessary, and so the 
-   respective logic can be safely removed
- - This patch was forwarded and merged upstream
-
-Change-Id: Ic8ea96abcf36b81d8104380bc596f593dae248d5
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile.am | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d89affb..1195376 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -68,12 +68,7 @@ all-local:
- 		--build-base $(shell readlink -f $(builddir))/build \
- 		--verbose)
- 
--# Fix for GNU/Linux
--if UNAME_IS_DEBIAN
--python_prefix = 
--else
- python_prefix = --prefix=$(DESTDIR)$(prefix)
--endif
- 
- install-exec-local:
- 	-mkdir -p $(DESTDIR)$(pkgpythondir)
diff --git a/debian/patches/series b/debian/patches/series
index d8cdcc6..57cd2ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
-0002-Remove-fix-for-Debian.patch
 0003-Add-remote-resource-to-local-cache.patch
 0004-Fix-privacy-breach-generic-caused-by-footer-template.patch
 0005-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/crmsh.git