Merge authors: Dmitrijs Ledkovs (dmitrij.ledkov) ------------------------------------------------------------ revno: 81 [merge] committer: Dmitrijs Ledkovs <[email protected]> branch nick: sword timestamp: Sun 2010-11-28 13:00:30 +0000 message: Import upstream version 1.6.2+dfsg added: CMakeLists.txt bindings/java-jni/README bindings/objc/ bindings/objc/English.lproj/ bindings/objc/English.lproj/InfoPlist.strings bindings/objc/Info copy.plist bindings/objc/Info.plist bindings/objc/ObjCSword.h bindings/objc/ObjCSword.xcodeproj/ bindings/objc/ObjCSword.xcodeproj/project.pbxproj bindings/objc/ObjCSword_Prefix.pch bindings/objc/README bindings/objc/Tests-Info.plist bindings/objc/build_clucene/ bindings/objc/build_clucene/Makefile bindings/objc/build_clucene/build_mac_clucene.sh bindings/objc/build_sword/ bindings/objc/build_sword/Makefile bindings/objc/build_sword/build_mac_sword.sh bindings/objc/build_sword/build_ub_mac_swordutils.sh bindings/objc/build_sword/readme.txt bindings/objc/dependencies/ bindings/objc/dependencies/retrieve.sh bindings/objc/doc/ bindings/objc/doc/SWORD-HOWTO.txt bindings/objc/doc/search.txt bindings/objc/src/ bindings/objc/src/Notifications.h bindings/objc/src/SwordBible.h bindings/objc/src/SwordBible.mm bindings/objc/src/SwordBibleBook.h bindings/objc/src/SwordBibleBook.mm bindings/objc/src/SwordBibleChapter.h bindings/objc/src/SwordBibleChapter.m bindings/objc/src/SwordBibleTextEntry.h bindings/objc/src/SwordBibleTextEntry.m bindings/objc/src/SwordBook.h bindings/objc/src/SwordBook.mm bindings/objc/src/SwordCommentary.h bindings/objc/src/SwordCommentary.mm bindings/objc/src/SwordDictionary.h bindings/objc/src/SwordDictionary.mm bindings/objc/src/SwordInstallSource.h bindings/objc/src/SwordInstallSource.mm bindings/objc/src/SwordInstallSourceController.h bindings/objc/src/SwordInstallSourceController.mm bindings/objc/src/SwordKey.h bindings/objc/src/SwordKey.mm bindings/objc/src/SwordListKey.h bindings/objc/src/SwordListKey.mm bindings/objc/src/SwordLocaleManager.h bindings/objc/src/SwordLocaleManager.mm bindings/objc/src/SwordManager.h bindings/objc/src/SwordManager.mm bindings/objc/src/SwordModule+Index.h bindings/objc/src/SwordModule+Index.mm bindings/objc/src/SwordModule.h bindings/objc/src/SwordModule.mm bindings/objc/src/SwordModuleTextEntry.h bindings/objc/src/SwordModuleTextEntry.m bindings/objc/src/SwordModuleTreeEntry.h bindings/objc/src/SwordModuleTreeEntry.m bindings/objc/src/SwordVerseKey.h bindings/objc/src/SwordVerseKey.mm bindings/objc/src/SwordVerseManager.h bindings/objc/src/SwordVerseManager.mm bindings/objc/src/VerseEnumerator.h bindings/objc/src/VerseEnumerator.mm bindings/objc/src/services/ bindings/objc/src/services/Configuration.h bindings/objc/src/services/Configuration.m bindings/objc/src/services/OSXConfiguration.h bindings/objc/src/services/OSXConfiguration.m bindings/objc/test/ bindings/objc/test/SwordListKeyTest.h bindings/objc/test/SwordListKeyTest.m bindings/objc/test/SwordManagerTest.h bindings/objc/test/SwordManagerTest.m bindings/objc/test/SwordModuleLongRunTest.h bindings/objc/test/SwordModuleLongRunTest.mm bindings/objc/test/SwordModuleTest.h bindings/objc/test/SwordModuleTest.m bindings/swig/local/ bindings/swig/local/std_multimap.i bindings/swig/package/local/ bindings/swig/package/local/std_multimap.i cmake/ cmake/FindCLucene.cmake cmake/FindICU.cmake cmake/FindLibraryWithDebug.cmake cmake/FindRegex.cmake cmake/README cmake/bindings.cmake cmake/configure-iphone-simulator.sh cmake/configure-iphone.sh cmake/install.cmake cmake/muxsources.cmake cmake/sources.cmake cmake/toolchains/ cmake/toolchains/iphone-2.2.1.toolchain-broken cmake/toolchains/iphone-3.0.toolchain cmake/toolchains/iphone-3.1.2.toolchain cmake/toolchains/iphone-3.1.3.toolchain cmake/toolchains/iphone-3.1.toolchain cmake/toolchains/iphone-simulator-2.2.1.toolchain-broken cmake/toolchains/iphone-simulator-3.0.toolchain cmake/toolchains/iphone-simulator-3.1.2.toolchain cmake/toolchains/iphone-simulator-3.1.3.toolchain cmake/toolchains/iphone-simulator-3.1.toolchain examples/cmdline/CMakeLists.txt include/canon_catholic.h include/canon_catholic2.h include/canon_synodalp.h locales.d/az-utf8.conf locales.d/hr-utf8.conf locales.d/zh_CN-utf8.conf locales.d/zh_Hans-utf8.conf locales.d/zh_Hant-utf8.conf m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 tests/CMakeLists.txt tests/testsuite/CMakeLists.txt utilities/CMakeLists.txt modified: ChangeLog Makefile.in README aclocal.m4 bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java bindings/corba/java/src/org/crosswire/util/Base64.java bindings/corba/omniorbcpp/swordorb-impl.cpp bindings/corba/orbitcpp/swordorb-impl.cpp bindings/corba/swordorb.idl bindings/java-jni/jni/Android.mk bindings/java-jni/jni/swordstub.cpp bindings/swig/package/Makefile.in bindings/swig/package/aclocal.m4 bindings/swig/package/autogen.sh bindings/swig/package/config.guess bindings/swig/package/config.sub bindings/swig/package/configure bindings/swig/package/configure.ac bindings/swig/package/ltmain.sh* bindings/swig/package/sword.i bindings/swig/package/templates.i bindings/swig/sword.i bindings/swig/sword.pl* bindings/swig/templates.i config.guess config.sub configure configure.ac doc/Doxyfile examples/Makefile.in examples/classes/Makefile examples/classes/ciphercng.cpp examples/cmdline/Makefile.in examples/cmdline/lookup.cpp icu/Makefile.in include/Makefile.am include/canon_german.h include/canon_synodal.h include/config.h include/config.h.in include/osishtmlhref.h include/sysdata.h include/versekey.h lib/Makefile.in lib/bcppmake/libsword.bpr lib/vcppmake/vc8/libsword.vcproj ltmain.sh* scripts/mkswordtar src/keys/versekey.cpp src/mgr/curlftpt.cpp src/mgr/versemgr.cpp src/modules/common/lzsscomprs.cpp src/modules/filters/gbfhtmlhref.cpp src/modules/filters/osishtmlhref.cpp src/modules/filters/teihtmlhref.cpp src/modules/filters/thmlhtmlhref.cpp src/modules/filters/utf8utf16.cpp src/modules/lexdict/zld/zld.cpp tests/Makefile.in tests/cppunit/Makefile.in tests/filtertest.cpp tests/parsekey.cpp tests/swaptest.cpp tests/testsuite/versekeytest.good tests/testsuite/verseparsing-utf8.good tests/testsuite/verseparsing-utf8.sh tests/testsuite/verseparsing.good tests/testsuite/verseparsing.sh tests/versekeytest.cpp utilities/Makefile.in utilities/addgb.cpp utilities/addld.cpp utilities/addvs.cpp utilities/cipherraw.cpp utilities/diatheke/Makefile.in utilities/diatheke/diatheke.vcproj utilities/emptyvss.cpp utilities/genbookutil.cpp utilities/imp2gbs.cpp utilities/imp2ld.cpp utilities/imp2vs.cpp utilities/installmgr.cpp utilities/mkfastmod.cpp utilities/mod2imp.cpp utilities/mod2osis.cpp utilities/mod2vpl.cpp utilities/mod2zmod.cpp utilities/modwrite.cpp utilities/osis2mod.cpp utilities/step2vpl.cpp utilities/stepdump.cpp utilities/tei2mod.cpp utilities/treeidxutil.cpp utilities/vcppmake/addgb.vcproj utilities/vcppmake/addld.vcproj utilities/vcppmake/addvs.vcproj utilities/vcppmake/cipherraw.vcproj utilities/vcppmake/emptyvss.vcproj utilities/vcppmake/genbookutil.vcproj utilities/vcppmake/imp2gbs.vcproj utilities/vcppmake/imp2ld.vcproj utilities/vcppmake/imp2vs.vcproj utilities/vcppmake/installmgr.vcproj utilities/vcppmake/mkfastmod.vcproj utilities/vcppmake/mod2imp.vcproj utilities/vcppmake/mod2osis.vcproj utilities/vcppmake/mod2vpl.vcproj utilities/vcppmake/mod2zmod.vcproj utilities/vcppmake/modwrite.vcproj utilities/vcppmake/osis2mod.vcproj utilities/vcppmake/step2vpl.vcproj utilities/vcppmake/stepdump.vcproj utilities/vcppmake/tei2mod.vcproj utilities/vcppmake/treeidxutil.vcproj utilities/vcppmake/vpl2mod.vcproj utilities/vcppmake/vs2osisref.vcproj utilities/vcppmake/vs2osisreftxt.vcproj utilities/vcppmake/xml2gbs.vcproj utilities/vpl2mod.cpp utilities/vs2osisref.cpp utilities/vs2osisreftxt.cpp utilities/xml2gbs.cpp The size of the diff (108427 lines) is larger than your specified limit of 1000 lines
-- lp:~pkgcrosswire/sword/main https://code.launchpad.net/~pkgcrosswire/sword/main Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/sword/main. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription _______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
