diff options
| author | Daniel Glassey <wdg@debian.org> | 2007-08-31 16:33:10 +0100 |
|---|---|---|
| committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-03-29 10:53:58 -0400 |
| commit | 9cd31d7874a42559408e8c2c8ec47c28cd0bb95f (patch) | |
| tree | a14aa05af8826e65f740cffa5ae90d97633127fb /debian/patches | |
| parent | 7c8d3dacc90d0e4c6461d64a7bbf629cc0e0c60b (diff) | |
Imported Debian patch 1.5.9-7
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/02_libver.diff | 21 | ||||
| -rw-r--r-- | debian/patches/09_pcfile.diff | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 27 insertions, 8 deletions
diff --git a/debian/patches/02_libver.diff b/debian/patches/02_libver.diff index 08eb55a..f02b9fe 100644 --- a/debian/patches/02_libver.diff +++ b/debian/patches/02_libver.diff @@ -1,10 +1,13 @@ Index: sword-1.5.9/lib/Makefile.am =================================================================== ---- sword-1.5.9.orig/lib/Makefile.am 2006-01-06 13:40:48.000000000 +0000 -+++ sword-1.5.9/lib/Makefile.am 2006-09-25 21:23:11.000000000 +0100 -@@ -36,7 +36,7 @@ +--- 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 @@ + endif - libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) + +-libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) ++libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS) -libsword_la_LDFLAGS = -release $(VERSION) +libsword_la_LDFLAGS = -version-info 6 @@ -13,8 +16,8 @@ Index: sword-1.5.9/lib/Makefile.am include ../src/utilfuns/Makefile.am Index: sword-1.5.9/lib/Makefile.in =================================================================== ---- sword-1.5.9.orig/lib/Makefile.in 2006-09-25 21:23:29.000000000 +0100 -+++ sword-1.5.9/lib/Makefile.in 2006-09-25 21:24:00.000000000 +0100 +--- 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@ @@ -72,11 +75,13 @@ Index: sword-1.5.9/lib/Makefile.in sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -@@ -451,7 +453,7 @@ +@@ -450,8 +452,8 @@ + #if WITHCURL @INSTALLMGR_TRUE@IMGRLIBADD = -lcurl $(CURL_LIBS) - libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) +-libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) -libsword_la_LDFLAGS = -release $(VERSION) ++libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS) +libsword_la_LDFLAGS = -version-info 6 keysdir = $(top_srcdir)/src/keys utilfunsdir = $(top_srcdir)/src/utilfuns diff --git a/debian/patches/09_pcfile.diff b/debian/patches/09_pcfile.diff new file mode 100644 index 0000000..ed48404 --- /dev/null +++ b/debian/patches/09_pcfile.diff @@ -0,0 +1,13 @@ +don't link frontends against libs unneccessarily +Index: sword-1.5.9/sword.pc.in +=================================================================== +--- sword-1.5.9.orig/sword.pc.in 2007-08-31 19:21:59.000000000 +0100 ++++ sword-1.5.9/sword.pc.in 2007-08-31 19:22:09.000000000 +0100 +@@ -7,6 +7,6 @@ + Name: SWORD + Description: Biblical Text Engine + Version: @VERSION@ +-Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@ ++Libs: -L${libdir} -lsword + Cflags: -I${includedir}/sword + diff --git a/debian/patches/series b/debian/patches/series index e00641d..b1f1535 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 06_warnings.diff 07_warn_tools.diff 08_gcc_43.diff +09_pcfile.diff |