update to lvm2-2.02.98

diff --git a/Makefile b/Makefile
index 16af3643eda504f915c8659b003a49bc007a356d..d07f6949a9008a0fe579f8288f0f5d950fb124de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 RELEASE=3.0
 
-LVMVERSION=2.02.95
-DMVERSION=1.02.74
+LVMVERSION=2.02.98
+DMVERSION=1.02.77
 # also update debian changelog patch
-PVERELEASE=pve3
+PVERELEASE=pve4
 PVEVER=${LVMVERSION}-${PVERELEASE}
 DMVER=${DMVERSION}-${PVERELEASE}
 
@@ -12,7 +12,7 @@ LVMSRC=lvm2_${LVMVERSION}.orig.tar.gz
 
 # NOTE: we use debian package definitions from debian testing
 # but use latest upstream sources
-DEBRELEASE=7
+DEBRELEASE=5
 LVMDEBSRC=lvm2_${LVMVERSION}-${DEBRELEASE}.debian.tar.gz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

diff --git a/lvm2_2.02.95-7.debian.tar.gz b/lvm2_2.02.95-7.debian.tar.gz
deleted file mode 100644 (file)
index 7d47e1f..0000000
Binary files a/lvm2_2.02.95-7.debian.tar.gz and /dev/null differ

diff --git a/lvm2_2.02.95.orig.tar.gz b/lvm2_2.02.95.orig.tar.gz
deleted file mode 100644 (file)
index 3490ca1..0000000
Binary files a/lvm2_2.02.95.orig.tar.gz and /dev/null differ

diff --git a/lvm2_2.02.98-5.debian.tar.gz b/lvm2_2.02.98-5.debian.tar.gz
new file mode 100644 (file)
index 0000000..8b251c0
Binary files /dev/null and b/lvm2_2.02.98-5.debian.tar.gz differ

diff --git a/lvm2_2.02.98.orig.tar.gz b/lvm2_2.02.98.orig.tar.gz
new file mode 100644 (file)
index 0000000..650a81f
Binary files /dev/null and b/lvm2_2.02.98.orig.tar.gz differ

diff --git a/patchdir/fix-build-dependencies.patch b/patchdir/fix-build-dependencies.patch
index 7451c26387ba8db27a5dc9a0d48fa87d94240dab..8bdb9faa666b8ecd663d663443e8cdbfcd798327 100644 (file)
--- a/patchdir/fix-build-dependencies.patch
+++ b/patchdir/fix-build-dependencies.patch
@@ -1,7 +1,7 @@
-Index: new/debian/control
+Index: lvm2-2.02.98/debian/control
 ===================================================================
---- new.orig/debian/control    2013-03-29 07:17:35.000000000 +0100
-+++ new/debian/control 2013-03-29 07:17:50.000000000 +0100
+--- lvm2-2.02.98.orig/debian/control   2013-07-14 16:39:32.000000000 +0200
++++ lvm2-2.02.98/debian/control        2013-08-13 12:15:25.000000000 +0200
 @@ -1,9 +1,9 @@
  Source: lvm2
  Section: admin
@@ -10,11 +10,11 @@ Index: new/debian/control
 +Maintainer: Proxmox Support Team <support@proxmox.com>
  Uploaders: Bastian Blank <waldi@debian.org>
 -Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
-+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config, libcorosync-pve-dev, redhat-cluster-pve-dev, libopenais-pve-dev, quilt
++Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline6-dev, libselinux1-dev, libudev-dev, pkg-config, libcorosync-pve-dev, redhat-cluster-pve-dev, libopenais-pve-dev, quilt
  Standards-Version: 3.9.1
  Homepage: http://sources.redhat.com/lvm2/
  Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
-@@ -38,8 +38,7 @@
+@@ -39,8 +39,7 @@
  Package: clvm
  Priority: extra
  Architecture: any

diff --git a/patchdir/fix-changelog.patch b/patchdir/fix-changelog.patch
index d6950dbbfe12ab76021dec6305d4a9de982eb4ba..9021f0e2839a7d5240220079107ffd02ab59a542 100644 (file)
--- a/patchdir/fix-changelog.patch
+++ b/patchdir/fix-changelog.patch
@@ -1,8 +1,14 @@
-Index: new/debian/changelog
+Index: lvm2-2.02.98/debian/changelog
 ===================================================================
---- new.orig/debian/changelog  2013-03-29 07:17:35.000000000 +0100
-+++ new/debian/changelog       2013-03-29 07:49:15.000000000 +0100
-@@ -1,3 +1,47 @@
+--- lvm2-2.02.98.orig/debian/changelog 2013-08-07 15:45:29.000000000 +0200
++++ lvm2-2.02.98/debian/changelog      2013-08-13 12:06:27.000000000 +0200
+@@ -1,3 +1,53 @@
++lvm2 (2.02.98-pve4) unstable; urgency=low
++
++  * New upstream release (fix for udev rules)
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Aug 2013 12:06:26 +0200
++
 +lvm2 (2.02.95-pve3) unstable; urgency=low
 +
 +  * update to wheezy
@@ -47,6 +53,6 @@ Index: new/debian/changelog
 +
 + -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Sep 2011 12:53:25 +0200
 +
- lvm2 (2.02.95-7) testing; urgency=low
+ lvm2 (2.02.98-5) unstable; urgency=low
  
-   * Re-enable cluster support. (closes: #697676)
+   * Fix udev rules.

diff --git a/patchdir/series b/patchdir/series
index 49e534e81fcf42e2aa9e399dde409b6e5962329e..3833d9c82937201bfbc5ede3b4fcb22ec578fd1b 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -1,7 +1,7 @@
 #re-enable-clvm.patch
 fix-build-dependencies.patch
 fix-changelog.patch
-fix-fsadm-install.patch
+#fix-fsadm-install.patch
 remove-udebs.patch
 #autodetect-locking-type.patch
 #suppress-error-messages.patch