[pve-devel] [PATCH 1/2] gfs2-utils: update package control files for updated build

[Thomas Lamprecht]

Updated debian package control files and Makefile to build gfs2-3.1.8
for Proxmox VE 3.4.
We use the following gfs2-utils sources for this build:
gfs2-utils.git: 3.1.8 tag

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 Makefile         |    6 +++---
 debian/changelog |    6 ++++++
 debian/control   |    2 +-
 debian/copyright |    4 ++--
 debian/docs      |    1 -
 debian/rules     |    6 ++----
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 101cdc2..6f1f8e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-RELEASE=3.0
+RELEASE=3.4
 
 PACKAGE=gfs2-utils
 PKGREL=1
-GFSUVER=3.1.3
-GFSUDIR=gfs2-utils
+GFSUVER=3.1.8
+GFSUDIR=gfs2-utils-${GFSUVER}
 GFSUSRC=gfs2-utils-${GFSUVER}.tar.gz
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
diff --git a/debian/changelog b/debian/changelog
index 1b6aa0a..872c055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gfs2-utils (3.1.8-1) unstable; urgency=low
+
+  * Update to latest stable upstream
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 04 Aug 2015 14:00:11 +0100
+
 gfs2-utils (3.1.3-1) unstable; urgency=low
 
   * Initial release 
diff --git a/debian/control b/debian/control
index 6199451..8a348ff 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 
 Package: gfs2-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, redhat-cluster-pve 
+Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, python, corosync
 Description:  Global file system 2 tools
  The Global File System allows a cluster of machines to concurrently access
  shared storage hardware like SANs or iSCSI and network block devices. GFS
diff --git a/debian/copyright b/debian/copyright
index 281b00f..0642f5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Proxmox Support Team <support at proxmox.com> on thu, 16 Feb 2012
+    Proxmox Support Team <support at proxmox.com> on tue, 04 Aug 2015
 
 It was downloaded from:
 
@@ -43,7 +43,7 @@ License:
 
 The Debian packaging is:
 
-    Copyright (C) 2012 Proxmox Server Solutions GmbH
+    Copyright (C) 2015 Proxmox Server Solutions GmbH
 
 and is licensed under the AGPL version 3
 
diff --git a/debian/docs b/debian/docs
index 1729ad5..8dfca40 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,4 @@
 README.build
-doc/usage.txt
 doc/gfs2.txt
 doc/journaling.txt
 debian/SOURCE
diff --git a/debian/rules b/debian/rules
index d8ae795..c2fd1e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,14 +18,12 @@ BUILDDIR=debian/gfs2-utils
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(BUILDROOT)/$(BUILDDIR)
 
-	rmdir $(BUILDDIR)/var/run/cluster
-
 	# we do not install upstream doc, instead we use
 	# dh_installdocs and dh_installexamples to copy files
 	rm -rf $(BUILDDIR)/usr/share/doc/gfs2-utils
 
 	dh_installdocs
 
-	install -D -m 755 gfs2/init.d/gfs2-cluster $(BUILDDIR)/etc/init.d/gfs2-cluster
+	install -D -m 755 gfs2/init.d/gfs2 $(BUILDDIR)/etc/init.d/gfs2
 
-	dh_installinit --onlyscripts --init-script=gfs2-cluster
\ No newline at end of file
+	dh_installinit --onlyscripts --init-script=gfs2
\ No newline at end of file
-- 
1.7.10.4