← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sword/lucid

« back to all changes in this revision

Viewing changes to debian/patches/02_libver.diff

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs, Jonathan Marsden, Dmitrijs Ledkovs
  • Date: 2010-01-21 00:10:17 UTC
  • mfrom: (1.1.4 upstream) (5.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100121001017-5ea19163rgisywbl
Tags: 1.6.1+dfsg-1
[ Jonathan Marsden ]
* debian/libsword8.examples: Add missing tcl eggdrop bot script.

[ Dmitrijs Ledkovs ]
* Drop shipping .la file in favour of pkg-config (Debian release goal)
  - More info http://lists.debian.org/debian-devel/2009/08/msg00783.html
* Drop backported patches, refreshed libver & compiler warnings.
* Compiling with -Werror enabled. 
* Bumped standards version to 3.8.3, no changes needed.
* Added debian/README.source documentation quilt usage
* Added configure option --without-internalregex

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_libver.diff
1
1
This patch changes the upstream SO name to Debian/Ubuntu SO name.
2
2
 
3
 
Index: main/lib/Makefile.am
 
3
Index: sword/lib/Makefile.am
4
4
===================================================================
5
 
--- main.orig/lib/Makefile.am   2009-05-25 10:23:38.000000000 -0700
6
 
+++ main/lib/Makefile.am        2009-05-25 10:41:16.000000000 -0700
7
 
@@ -36,7 +36,7 @@
 
5
--- sword.orig/lib/Makefile.am  2010-01-03 04:36:09.622945995 +0200
 
6
+++ sword/lib/Makefile.am       2010-01-03 04:38:16.010955077 +0200
 
7
@@ -23,7 +23,7 @@
8
8
 
9
 
 libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
 
9
 AM_CPPFLAGS += $(ICUDEF)
10
10
 
11
11
-libsword_la_LDFLAGS = -release $(VERSION)
12
12
+libsword_la_LDFLAGS = -version-info 8
13
13
 
14
14
 include ../src/keys/Makefile.am
15
15
 include ../src/utilfuns/Makefile.am
16
 
Index: main/lib/Makefile.in
 
16
Index: sword/lib/Makefile.in
17
17
===================================================================
18
 
--- main.orig/lib/Makefile.in   2009-05-25 10:23:38.000000000 -0700
19
 
+++ main/lib/Makefile.in        2009-05-25 10:41:37.000000000 -0700
20
 
@@ -452,7 +452,7 @@
21
 
 #if WITHCURL
22
 
 @INSTALLMGR_TRUE@IMGRLIBADD = -lcurl $(CURL_LIBS)
23
 
 libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
 
18
--- sword.orig/lib/Makefile.in  2010-01-03 03:49:46.274945658 +0200
 
19
+++ sword/lib/Makefile.in       2010-01-03 04:38:47.198943804 +0200
 
20
@@ -537,7 +537,7 @@
 
21
        $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp
 
22
 @HAVE_ICU_FALSE@ICUDEF = 
 
23
 @HAVE_ICU_TRUE@ICUDEF = -DSWICU_DATA=\"${pkglibdir}/${VERSION}_icu_${ICU_VER}\" 
24
24
-libsword_la_LDFLAGS = -release $(VERSION)
25
25
+libsword_la_LDFLAGS = -version-info 8
26
26
 keysdir = $(top_srcdir)/src/keys