gfs2-utils: update package control files

Updated debian package control files and Makefile to build GFS2-3.1.8
for Proxmox VE 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@proxmox.com>

diff --git a/Makefile b/Makefile
index 101cdc27e46e57c5f9a2702f1ee37a6cfb7ae5c7..3acf18d95df5b0fd05f2188c0876798c39b58fd8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-RELEASE=3.0
+RELEASE=4.0
 
 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 1b6aa0aac8b3aa585c6c40beb7342b046c438e7a..4bb8086a843138262e074a87a8d8a099ccd24044 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-gfs2-utils (3.1.3-1) unstable; urgency=low
+gfs2-utils (3.1.8-1) unstable; urgency=low
 
-  * Initial release 
+  * bump to version 3.1.8, compiling for PVE4
 
  -- Proxmox Support Team <support@proxmox.com>  Thu, 16 Feb 2012 13:44:11 +0100

diff --git a/debian/control b/debian/control
index 619945129c99faeada0867feabd73bdbf273432f..8a348ffc4acfa5226e94199196ce399e61cafb92 100644 (file)
--- 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 281b00f5c2cd984d5e187feda64946aad3f5bef8..6d617c079f6d3bf08f57017f72b4517e9da3b453 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Proxmox Support Team <support@proxmox.com> on thu, 16 Feb 2012
+    Proxmox Support Team <support@proxmox.com> on mon, 27 Jul 2015
 
 It was downloaded from:
 

diff --git a/debian/docs b/debian/docs
index 1729ad57a442fe45904c86a0b9fc880daad23974..8dfca405017aa646a8f602e1713be0b89068052c 100644 (file)
--- 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 d8ae795ffefc80c67653b4c4b0c47ad4bbca6865..5256dca7c987be3e71853a1f943a5a9bf1084909 100755 (executable)
--- 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