Imported Debian patch 1.5.11-1

3 files changed, 15 insertions, 81 deletions

diff --git a/debian/patches/02_libver.diff b/debian/patches/02_libver.diff
index f02b9fe..c161d1c 100644
--- a/debian/patches/02_libver.diff
+++ b/debian/patches/02_libver.diff
@@ -1,88 +1,28 @@
-Index: sword-1.5.9/lib/Makefile.am
+This patch changes the upsteam SO name to Debian/Ubuntu SO name.
+
+Index: sword-1.5.11/lib/Makefile.am
 ===================================================================
---- sword-1.5.9.orig/lib/Makefile.am	2007-09-01 11:16:04.000000000 +0100
-+++ sword-1.5.9/lib/Makefile.am	2007-09-01 11:17:05.000000000 +0100
-@@ -34,9 +34,9 @@
+--- sword-1.5.11.orig/lib/Makefile.am	2007-09-01 11:16:04.000000000 +0100
++++ sword-1.5.11/lib/Makefile.am	2007-09-01 11:17:05.000000000 +0100
+@@ -36,7 +36,7 @@
  endif
  
  
--libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) 
-+libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
- 
 -libsword_la_LDFLAGS = -release $(VERSION)
-+libsword_la_LDFLAGS = -version-info 6
++libsword_la_LDFLAGS = -version-info 7
  
  include ../src/keys/Makefile.am
  include ../src/utilfuns/Makefile.am
-Index: sword-1.5.9/lib/Makefile.in
+Index: sword-1.5.11/lib/Makefile.in
 ===================================================================
---- sword-1.5.9.orig/lib/Makefile.in	2007-09-01 11:16:04.000000000 +0100
-+++ sword-1.5.9/lib/Makefile.in	2007-09-01 11:18:27.000000000 +0100
-@@ -277,6 +277,7 @@
- GENCCODE = @GENCCODE@
- GENCMN = @GENCMN@
- GENRB = @GENRB@
-+GREP = @GREP@
- HAVE_CPPUNIT_FALSE = @HAVE_CPPUNIT_FALSE@
- HAVE_CPPUNIT_TRUE = @HAVE_CPPUNIT_TRUE@
- ICUSWORD_FALSE = @ICUSWORD_FALSE@
-@@ -335,15 +336,9 @@
- XML_LIBS = @XML_LIBS@
- ZLIB_FALSE = @ZLIB_FALSE@
- ZLIB_TRUE = @ZLIB_TRUE@
--ac_ct_AR = @ac_ct_AR@
--ac_ct_AS = @ac_ct_AS@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -360,7 +355,10 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- dir_confdef = @dir_confdef@
-+docdir = @docdir@
-+dvidir = @dvidir@
- enable_debug = @enable_debug@
- enable_profile = @enable_profile@
- exec_prefix = @exec_prefix@
-@@ -369,17 +367,21 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -450,8 +452,8 @@
- 
+--- sword-1.5.11.orig/lib/Makefile.in	2007-09-01 11:16:04.000000000 +0100
++++ sword-1.5.11/lib/Makefile.in	2007-09-01 11:18:27.000000000 +0100
+@@ -436,7 +436,7 @@
  #if WITHCURL
  @INSTALLMGR_TRUE@IMGRLIBADD = -lcurl $(CURL_LIBS)
--libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) 
+ libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
 -libsword_la_LDFLAGS = -release $(VERSION)
-+libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
-+libsword_la_LDFLAGS = -version-info 6
++libsword_la_LDFLAGS = -version-info 7
  keysdir = $(top_srcdir)/src/keys
  utilfunsdir = $(top_srcdir)/src/utilfuns
  @INTERNALFTPLIB_FALSE@ftpsrc = 
diff --git a/debian/patches/10_diatheke.diff b/debian/patches/10_diatheke.diff
index 9e9896f..1288970 100644
--- a/debian/patches/10_diatheke.diff
+++ b/debian/patches/10_diatheke.diff
@@ -1,3 +1,5 @@
+This patch simplifies the $range assignment.
+
 Index: sword-1.5.9/utilities/diatheke/cgi/diatheke.pl
 ===================================================================
 --- sword-1.5.9.orig/utilities/diatheke/cgi/diatheke.pl	2008-02-18 22:10:09.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
index 139d167..4509e64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,2 @@
-01_sword_c++.diff
 02_libver.diff
-03_clucene.diff
-04_ziplock.diff
-05_getline.diff
-06_warnings.diff
-07_warn_tools.diff
-08_gcc_43.diff
-09_pcfile.diff
 10_diatheke.diff