Imported Debian patch 1.6.1+dfsg-2

7 files changed, 41 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 1434552..d63686b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sword (1.6.1+dfsg-2) unstable; urgency=low
+
+  [ Dmitrijs Ledkovs ]
+  * Fixed lintian warning about watch file.
+  * debian/patches/13_curl - Upstream fix for curl 7.20 compatibility.
+  * bumped standards version to 3.8.4 - no changes required.
+  * Update email address.
+  * Added upstream changelog.
+  * debian/copyright:
+    - Removed reference to unversioned GPL license
+    - Two files do not explictly specify GPL version
+    - Based on clause 9 GPL-2 & clause 14 GPL-3, GPL-2 is selected such
+    that to be compatible with the rest of sword
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Mon, 22 Mar 2010 19:14:19 +0000
+
 sword (1.6.1+dfsg-1) unstable; urgency=low
 
   [ Jonathan Marsden ]
diff --git a/debian/control b/debian/control
index 5d4fb10..0ee5e62 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Section: libs
 Priority: optional
 Maintainer: CrossWire Packages <pkg-crosswire-devel@lists.alioth.debian.org>
 Uploaders: Daniel Glassey <wdg@debian.org>,
- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com>,
+ Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>,
  Jonathan Marsden <jmarsden@fastmail.fm>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.crosswire.org/sword/
 
 Package: libsword8
diff --git a/debian/copyright b/debian/copyright
index 4b996ad..1910e3d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,10 +23,6 @@ Files: *
 Copyright: 1996-2009 CrossWire Bible Society
 License: GPL-2
 
-Files: include/hebrewmcim.h include/swinputmeth.h
-Copyright: 2001 CrossWire Bible Society
-License: GPL
-
 Files: include/installmgr.h
        include/rawverse.h
        include/defs.h
@@ -74,10 +70,6 @@ Copyright: 2009 CrossWire Packaging Team <pkg-crosswire-devel@lists.alioth.debia
             -2008 Daniel Glassey <wdg@debian.org>
 License: GPL-2+
 
-License: GPL
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL.
-
 License: GPL-2
  On Debian systems, the complete text of the GNU General Public
  License, version 2, can be found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/patches/13_curl.diff b/debian/patches/13_curl.diff
new file mode 100644
index 0000000..f0934b6
--- /dev/null
+++ b/debian/patches/13_curl.diff
@@ -0,0 +1,21 @@
+revno: 2452
+svn revno: 2506 (on /trunk)
+committer: scribe
+timestamp: Sat 2010-03-20 11:49:54 +0000
+message:
+  applied Karl's patch to fix libcurl problem with status reporter data.
+
+Index: sword/src/mgr/curlftpt.cpp
+===================================================================
+--- sword.orig/src/mgr/curlftpt.cpp	2010-03-22 18:22:59.045847934 +0000
++++ sword/src/mgr/curlftpt.cpp	2010-03-22 18:23:02.244846081 +0000
+@@ -177,6 +177,9 @@
+ 		res = curl_easy_perform(session);
+ 		SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
+ 
++		// it seems CURL tries to use this option data later for some reason, so we unset here
++		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
++
+ 		if(CURLE_OK != res) {
+ 			retVal = -1;
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index d9bddb8..e0f9d43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02_libver.diff
 12_fix_compiler_warnings.diff
+13_curl.diff
diff --git a/debian/rules b/debian/rules
index 76e9f75..177d319 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DEB_DBG_PACKAGE_libsword8 := libsword-dbg
 #CppUnitTestSuite - currently broken
 #DEB_MAKE_CHECK_TARGET := check
 DEB_OPT_FLAG := -g -O3 -Wall -Werror
+DEB_INSTALL_CHANGELOGS_ALL = ChangeLog
 
 build/libsword8::
 	#Running Shell based Testsuite
diff --git a/debian/watch b/debian/watch
index 0eb6349..b61694f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=3
-http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz
 opts=dversionmangle=s/\+dfsg\d*// \
   http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz