update to master branch, bump version to 0.4.0-4

diff --git a/Makefile b/Makefile
index 19f97b88065b59677bd6e310e29af9bf55532198..06c7a0df0d021e18ba2d69745d5974231cf2fe0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.1
 
 PACKAGE=pve-sheepdog
-PKGREL=3
+PKGREL=4
 SDVER=0.4.0
 
 DEB=${PACKAGE}_${SDVER}-${PKGREL}_amd64.deb
@@ -16,7 +16,7 @@ ${DEB} deb: ${SDSRC}
        tar xf ${SDSRC}
        cp -av debian ${SDDIR}/debian
        cd ${SDDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-       lintian --suppress-tags possible-gpl-code-linked-with-openssl ${DEB}
+       lintian ${DEB}
 
 .PHONY: download
 ${SDSRC} download:

diff --git a/debian/changelog b/debian/changelog
index 911d68b27d1d77df23a3022749e93b786dae4b40..a6c7b9228793018c507c6ea668ff3213d275f6b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-sheepdog (0.4.0-4) unstable; urgency=low
+
+  * update to master branch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Jul 2012 06:56:28 +0200
+
 pve-sheepdog (0.4.0-3) unstable; urgency=low
 
   * Simplify logfile rotation. We simply rename <logfile> to

diff --git a/debian/patches/fix-manpage-section.patch b/debian/patches/fix-manpage-section.patch
deleted file mode 100644 (file)
index bcf4db4..0000000
--- a/debian/patches/fix-manpage-section.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: new/man/collie.8
-===================================================================
---- new.orig/man/collie.8      2012-07-09 11:24:55.000000000 +0200
-+++ new/man/collie.8   2012-07-09 11:27:02.000000000 +0200
-@@ -1,4 +1,4 @@
--.TH SHEEPDOG 2012-06-27
-+.TH SHEEPDOG 8 2012-06-27
- .SH NAME
- collie \- Command line utility for the sheep daemon
- .SH SYNOPSIS
-Index: new/man/sheep.8
-===================================================================
---- new.orig/man/sheep.8       2012-07-09 11:28:02.000000000 +0200
-+++ new/man/sheep.8    2012-07-09 11:28:16.000000000 +0200
-@@ -1,4 +1,4 @@
--.TH SHEEPDOG 2012-07-3
-+.TH SHEEPDOG 8 2012-07-3
- .SH NAME
- sheep \- Distributed Block Storage System for KVM
- .SH SYNOPSIS
-Index: new/man/sheepfs.8
-===================================================================
---- new.orig/man/sheepfs.8     2012-07-09 11:28:07.000000000 +0200
-+++ new/man/sheepfs.8  2012-07-09 11:28:22.000000000 +0200
-@@ -1,4 +1,4 @@
--.TH SHEEPDOG 2012-06-27
-+.TH SHEEPDOG 8 2012-06-27
- .SH NAME
- sheepfs \- A pseudo file system exports both Sheepdog's internal state as well as Sheepdog's storage
- .SH SYNOPSIS

diff --git a/debian/patches/series b/debian/patches/series
index 2fd04b7d51a9d9131dc2404b8fda4e2f038db4f8..a2688ed3a0011351ade193bf3e95a46f32709d4d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 disable-test-suite.patch
-fix-manpage-section.patch
 do-not-install-generic-init-script.patch
 simplify-log-rotation.patch

diff --git a/sheepdog-0.4.0.tar.gz b/sheepdog-0.4.0.tar.gz
index 2fb1c10fd128ed81e1f4ddf16896d749c960b2d2..0e4c83575f3f199b1d3962e0c344239cdd51d7e3 100644 (file)
Binary files a/sheepdog-0.4.0.tar.gz and b/sheepdog-0.4.0.tar.gz differ