[SCM] QCA2 OpenSSL plugin packaging branch, master, updated. debian/0.1-20070904-3-18-g53fea5d

[Felix Geyer]

The following commit has been merged in the master branch:
commit 976d511b60bcdf994098a861d8a5975199eaeb34
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon May 30 00:44:17 2011 +0200

    Switch to source format 3.0 (quilt).
    
    Turn changes from the last revision into a proper patch:
    remove_whirlpool_algo.diff
---
 debian/changelog                                   |    5 +++++
 ...ca-ossl.cpp.diff => remove_whirlpool_algo.diff} |   12 ++++++++----
 debian/patches/series                              |    1 +
 debian/source/format                               |    1 +
 debian/source/local-options                        |    1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c09c62e..28c31e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ qca2-plugin-ossl (2.0.0~beta3-1) UNRELEASED; urgency=low
   * Add Homepage: to control.
   * Add watch file.
 
+  [ Felix Geyer ]
+  * Switch to source format 3.0 (quilt).
+    - Turn changes from the last revision into a proper patch:
+      remove_whirlpool_algo.diff
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 23:15:26 +0200
 
 qca2-plugin-ossl (0.1~20070904-4) unstable; urgency=low
diff --git a/debian/patches/qca-ossl.cpp.diff b/debian/patches/remove_whirlpool_algo.diff
similarity index 61%
rename from debian/patches/qca-ossl.cpp.diff
rename to debian/patches/remove_whirlpool_algo.diff
index 7250905..aff88ff 100644
--- a/debian/patches/qca-ossl.cpp.diff
+++ b/debian/patches/remove_whirlpool_algo.diff
@@ -1,6 +1,10 @@
---- qca2-plugin-ossl-0.1~20070904.orig/qca-ossl.cpp
-+++ qca2-plugin-ossl-0.1~20070904/qca-ossl.cpp
-@@ -6389,9 +6389,11 @@
+Description: remove whirlpool usage.  the algorithm is missing on at least
+ 0.9.8g and 0.9.8i, even though there's an OBJ_whirlpool definition in 0.9.8i.
+Origin: upstream, http://websvn.kde.org/?view=revision&revision=864423
+
+--- qca-ossl/qca-ossl.cpp
++++ qca-ossl/qca-ossl.cpp
+@@ -6616,9 +6616,11 @@
  #ifdef SHA512_DIGEST_LENGTH
  	list += "sha512";
  #endif
@@ -12,7 +16,7 @@
  	return list;
  }
  
-@@ -6600,10 +6602,12 @@
+@@ -6863,10 +6865,12 @@
  		else if ( type == "sha512" )
  			return new opensslHashContext( EVP_sha512(), this, type);
  #endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..01254e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_whirlpool_algo.diff
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
QCA2 OpenSSL plugin packaging