[Pkg-crosswire-devel] [Branch ~pkgcrosswire/libsword/main] Rev 47: Add 11_regex_only_when_needed.diff patch

noreply at launchpad.net noreply at launchpad.net
Mon May 25 03:39:07 BST 2009 

------------------------------------------------------------
revno: 47
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Sun 2009-05-24 19:00:51 -0700
message:
  Add 11_regex_only_when_needed.diff patch
added:
  debian/patches/11_regex_only_when_needed.diff
modified:
  debian/changelog
  debian/patches/series

=== modified file 'debian/changelog'
--- debian/changelog	2009-05-25 01:12:22 +0000
+++ debian/changelog	2009-05-25 02:00:51 +0000
@@ -6,8 +6,10 @@
     - Bump SONAME to 8 -- SWORD 1.6 is not backward compatible with 1.5.11.
   * debian/patches/series:
     - Remove 10_diatheke.diff -- included in upstream source.
+    - Add 11_regex_only_when_needed.diff.
   * debian/patches/:
     - Remove several old unused .diff files.
+    - Add 11_regex_only_when_needed.diff to conditionally include regex lib.
   * debian/libsword7.*: 
     - Rename to libsword8.*
     - Change libsword7 to libsword8 within files.

=== added file 'debian/patches/11_regex_only_when_needed.diff'
--- debian/patches/11_regex_only_when_needed.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/11_regex_only_when_needed.diff	2009-05-25 02:00:51 +0000
@@ -0,0 +1,132 @@
+Index: main/include/Makefile.am
+===================================================================
+--- main.orig/include/Makefile.am	2009-05-24 18:25:38.000000000 -0700
++++ main/include/Makefile.am	2009-05-24 18:25:57.000000000 -0700
+@@ -76,7 +76,9 @@
+ pkginclude_HEADERS += $(swincludedir)/rawstr4.h
+ pkginclude_HEADERS += $(swincludedir)/rawtext.h
+ pkginclude_HEADERS += $(swincludedir)/rawverse.h
++if MINGW
+ pkginclude_HEADERS += $(swincludedir)/regex.h
++endif
+ pkginclude_HEADERS += $(swincludedir)/roman.h
+ pkginclude_HEADERS += $(swincludedir)/rtfhtml.h
+ pkginclude_HEADERS += $(swincludedir)/sapphire.h
+Index: main/lib/Makefile.in
+===================================================================
+--- main.orig/lib/Makefile.in	2009-05-24 18:28:58.000000000 -0700
++++ main/lib/Makefile.in	2009-05-24 18:29:58.000000000 -0700
+@@ -34,7 +34,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-DIST_COMMON = README $(pkginclude_HEADERS) \
++DIST_COMMON = README $(am__pkginclude_HEADERS_DIST) \
+ 	$(srcdir)/../include/Makefile.am \
+ 	$(srcdir)/../src/frontend/Makefile.am \
+ 	$(srcdir)/../src/keys/Makefile.am \
+@@ -61,6 +61,7 @@
+ 	$(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
+ @HAVE_VSNPRINTF_FALSE at am__append_1 = -DNO_VSNPRINTF
++ at MINGW_TRUE@am__append_2 = $(swincludedir)/regex.h
+ subdir = lib
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+@@ -238,6 +239,86 @@
+ 	$(LDFLAGS) -o $@
+ SOURCES = $(libsword_la_SOURCES)
+ DIST_SOURCES = $(am__libsword_la_SOURCES_DIST)
++am__pkginclude_HEADERS_DIST = $(swincludedir)/Greek2Greek.h \
++	$(swincludedir)/GreekChars.h $(swincludedir)/canon.h \
++	$(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \
++	$(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \
++	$(swincludedir)/defs.h $(swincludedir)/echomod.h \
++	$(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \
++	$(swincludedir)/femain.h $(swincludedir)/filemgr.h \
++	$(swincludedir)/versemgr.h $(swincludedir)/flatapi.h \
++	$(swincludedir)/ftpparse.h $(swincludedir)/ftptrans.h \
++	$(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \
++	$(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \
++	$(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h \
++	$(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \
++	$(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \
++	$(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \
++	$(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \
++	$(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h \
++	$(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h \
++	$(swincludedir)/installmgr.h $(swincludedir)/latin1utf16.h \
++	$(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h \
++	$(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h \
++	$(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h \
++	$(swincludedir)/nullim.h $(swincludedir)/osisheadings.h \
++	$(swincludedir)/osishtmlhref.h $(swincludedir)/osiswebif.h \
++	$(swincludedir)/osismorph.h \
++	$(swincludedir)/osismorphsegmentation.h \
++	$(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \
++	$(swincludedir)/osisosis.h $(swincludedir)/osisstrongs.h \
++	$(swincludedir)/osisfootnotes.h $(swincludedir)/osislemma.h \
++	$(swincludedir)/osisredletterwords.h \
++	$(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \
++	$(swincludedir)/osisvariants.h $(swincludedir)/papyriplain.h \
++	$(swincludedir)/plainfootnotes.h $(swincludedir)/plainhtml.h \
++	$(swincludedir)/rawcom.h $(swincludedir)/rawfiles.h \
++	$(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \
++	$(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \
++	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
++	$(swincludedir)/rawverse.h $(swincludedir)/regex.h \
++	$(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \
++	$(swincludedir)/sapphire.h $(swincludedir)/strkey.h \
++	$(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \
++	$(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \
++	$(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \
++	$(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \
++	$(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \
++	$(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \
++	$(swincludedir)/swkey.h $(swincludedir)/swld.h \
++	$(swincludedir)/swlocale.h $(swincludedir)/swlog.h \
++	$(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \
++	$(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \
++	$(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \
++	$(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \
++	$(swincludedir)/swunicod.h $(swincludedir)/swversion.h \
++	$(swincludedir)/sysdata.h $(swincludedir)/thmlfootnotes.h \
++	$(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h \
++	$(swincludedir)/thmlhtml.h $(swincludedir)/thmlhtmlhref.h \
++	$(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \
++	$(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \
++	$(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \
++	$(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \
++	$(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \
++	$(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \
++	$(swincludedir)/teihtmlhref.h $(swincludedir)/treekey.h \
++	$(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h \
++	$(swincludedir)/url.h $(swincludedir)/untgz.h \
++	$(swincludedir)/utf16utf8.h $(swincludedir)/utf8arshaping.h \
++	$(swincludedir)/utf8bidireorder.h \
++	$(swincludedir)/utf8cantillation.h \
++	$(swincludedir)/utf8greekaccents.h \
++	$(swincludedir)/utf8hebrewpoints.h \
++	$(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \
++	$(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \
++	$(swincludedir)/utf8nfkd.h \
++	$(swincludedir)/utf8transliterator.h \
++	$(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \
++	$(swincludedir)/utilxml.h $(swincludedir)/versekey.h \
++	$(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \
++	$(swincludedir)/zconf.h $(swincludedir)/zipcomprs.h \
++	$(swincludedir)/zld.h $(swincludedir)/zstr.h \
++	$(swincludedir)/ztext.h $(swincludedir)/zverse.h
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -575,7 +656,7 @@
+ 	$(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \
+ 	$(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \
+ 	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
+-	$(swincludedir)/rawverse.h $(swincludedir)/regex.h \
++	$(swincludedir)/rawverse.h $(am__append_2) \
+ 	$(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \
+ 	$(swincludedir)/sapphire.h $(swincludedir)/strkey.h \
+ 	$(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-04-13 03:22:23 +0000
+++ debian/patches/series	2009-05-25 02:00:51 +0000
@@ -1,2 +1,2 @@
 02_libver.diff
-
+11_regex_only_when_needed.diff



--
Main packaging branch
https://code.launchpad.net/~pkgcrosswire/libsword/main

Your team Crosswire Packaging Team is subscribed to branch lp:libsword.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/libsword/main/+edit-subscription.

More information about the Pkg-crosswire-devel mailing list