--- fbreader-0.12.10dfsg2.orig/debian/NEWS +++ fbreader-0.12.10dfsg2/debian/NEWS @@ -0,0 +1,14 @@ +fbreader (0.12.9dfsg-1) experimental; urgency=low + + The information on all books is moved from XML files to the SQLite database. + This migration work is executed once on the first launch of the new version + of FBReader. + The migration includes some correction of tags, for which FBReader needs + an access to the books. Thus, before the first launch of the new FBReader + version it is strongly recommended to attach all removable mass storages + on which books are stored. + + Qt3 interface for fbreader (the package libzlui-qt) is not built anymore. + Use Qt4 interface (the package libzlui-qt4) instead. + + -- Eugene V. Lyubimkin Sun, 13 Dec 2009 11:08:27 +0200 --- fbreader-0.12.10dfsg2.orig/debian/README.source +++ fbreader-0.12.10dfsg2/debian/README.source @@ -0,0 +1,9 @@ +This Debian package for FBReader does not contain some hyphenation patterns due +to following license problems: + +el.pattern: no license +fi.pattern: modification is not explicitly allowed +tr.pattern: no license + +These files were removed from zlibrary/text/data/hyphenationPatterns.zip. + --- fbreader-0.12.10dfsg2.orig/debian/changelog +++ fbreader-0.12.10dfsg2/debian/changelog @@ -0,0 +1,665 @@ +fbreader (0.12.10dfsg2-3) unstable; urgency=medium + + * debian/patches: + - New patch 0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch. + Fixes building with curl 7.62.0. Thanks to Adrian Bunk for the report + and the libcurl API change hint. (Closes: #913382) + - New patch 0012-makefiles-use-externally-passed-PKG_CONFIG-if-availa by + Helmut Grohne. + * debian/rules: + - Enable cross-architecture building. Patch by Helmut Grohne. + (Closes: #861422) + * debian/control: + - Updated Standards-Version to 4.2.1, no changes needed. + - Added Recommends on sensible-utils (as suggested by lintian). + * debian/source/format: + - Created (with '1.0' inside). + * debian/libzlcore-data.lintian-overrides: + - Removed a false positive override introduced in 0.12.10dfsg2-1, + apparently fixed in lintian since. + + -- Eugene V. Lyubimkin Sun, 09 Dec 2018 18:21:31 +0100 + +fbreader (0.12.10dfsg2-2) unstable; urgency=medium + + * debian/patches: + - New patch booksdb-avoid-converting-boolean-to-shared_ptr.patch. Fixes + building with GCC6. Patch by Robert Bihlmeyer. (Closes: #811676) + * debian/copyright: + - Updated my e-mail address. + - Removed obsolete statements for DocBook/XHTML entity files removed in + the previous upload. (Closes: #824393) + + -- Eugene V. Lyubimkin Sun, 24 Jul 2016 13:40:32 +0200 + +fbreader (0.12.10dfsg2-1) unstable; urgency=medium + + * debian/dfsg-repack: + - Also remove docbook- and XHTML entity files. (Closes: #807074) + * debian/patches: + - New patch fbreader-Makefile-do-not-try-to-install-empty-format.patch, so + upstream Makefile doesn't install unexisting XHTML entity files. + * debian/control: + - Updated Standards-Version to 3.9.6, no changes needed. + - Bumped debhelper build-dependency to >= 9. + * debian/rules: + - Modernized using dh overrides. + * debian/menu: + - Removed as suggested by lintian, since a .desktop-file is present. + * debian/libzlcore-data.lintian-overrides: + - Added to override a false positive about reproducibility of + usr/share/zlibrary/unicode.xml.gz. + + -- Eugene V. Lyubimkin Sun, 21 Feb 2016 10:46:49 +0100 + +fbreader (0.12.10dfsg-10) unstable; urgency=low + + * NMU acknowledged - thanks, Ondřej! + * debian/control: + - Bump ABI parts of libzlcore and libzltext package names for GCC5 C++11 + ABI transition. For historical reasons these package name parts were + actually a bit off the SONAMEs, and now it's a good time to fix it. + (Closes: #763468) + + -- Eugene V. Lyubimkin Tue, 21 Jul 2015 20:52:34 +0300 + +fbreader (0.12.10dfsg-9.1) unstable; urgency=medium + + * Change B-D to libjpeg-dev to finish the transition to libjpeg-turbo + + -- Ondřej Surý Mon, 29 Sep 2014 14:04:47 +0200 + +fbreader (0.12.10dfsg-9) unstable; urgency=low + + * debian/control: + - Bumped Standards-Version to 3.9.4, no changes needed. + - Build-depend on libunibreak-dev instead of liblinebreak2-dev. + * debian/patches: + - New patch 950-link-to-libunibreak.patch. + - New patch 951-fix-calling-compiler.patch, which replaces old + 940-use-debian-compiler-flags.patch: reworked to not override compiler + flags by "target setup" instead of introducing DEBFLAGS, force verbose + compilation and introduce CPPFLAGS and CXXFLAGS where needed. + * debian/rules: + - Include dpkg's buildflags.mk if present to support hardening. + - Removed DEBFLAGS-hack. + - Removed obsolete commented Qt3-related line. + + -- Eugene V. Lyubimkin Fri, 21 Jun 2013 13:17:00 +0300 + +fbreader (0.12.10dfsg-8) unstable; urgency=low + + * debian/patches: + - New patch 600-fix-ftell-crash.patch, fixing a possible crash on + migration. (Closes: #689338) + + -- Eugene V. Lyubimkin Sat, 06 Oct 2012 12:33:58 +0300 + +fbreader (0.12.10dfsg-7) unstable; urgency=medium + + * debian/rules: + - Fixed FTFBS on binary-only builds. Report by Pino Toscano, patch by + Salvatore Bonaccorso. (Closes: #680657) + * debian/control: + - Bumped Standards-Version to 3.9.3, no changes needed. + + -- Eugene V. Lyubimkin Sun, 08 Jul 2012 12:05:01 +0300 + +fbreader (0.12.10dfsg-6) unstable; urgency=medium + + * debian/patches: + - New patch 910-zlui-qt4-links-to-QtCore.patch. Thanks to Stepan Golosunov + for the report. (Closes: #649612) + + -- Eugene V. Lyubimkin Sat, 26 Nov 2011 12:35:23 +0200 + +fbreader (0.12.10dfsg-5) unstable; urgency=low + + * debian/{control,rules} + - Don't build zlui-maemo anymore as its build-depends will be removed from + Debian repositories. (Closes: #643745) + * debian/patches: + - Dropped maemo-specific patches as not needed anymore. + * debian/NEWS: + - Set the version of really uploaded package. + Fixes a lintian warning 'debian-news-entry-has-unknown-version'. + + -- Eugene V. Lyubimkin Thu, 29 Sep 2011 19:25:10 +0300 + +fbreader (0.12.10dfsg-4) unstable; urgency=low + + * debian/control: + - Build-depend on liblinebreak{ -> 2}-dev. + + -- Eugene V. Lyubimkin Tue, 14 Jun 2011 19:38:15 +0300 + +fbreader (0.12.10dfsg-3) unstable; urgency=medium + + * debian/patches: + - New patch 030-use-pkgconfig-includes.patch from Steve Langasek. + (Closes: #620852) + - New patch 400-fix-building-with-gcc46.patch. Fixes FTBFS. + (Closes: #618051) + * debian/control: + - Bumped Standards-Version to 3.9.2, no changes needed. + + -- Eugene V. Lyubimkin Sat, 28 May 2011 14:01:16 +0300 + +fbreader (0.12.10dfsg-2) unstable; urgency=low + + * Upload to unstable. (Closes: #613902) + + -- Eugene V. Lyubimkin Sat, 19 Feb 2011 14:15:35 +0200 + +fbreader (0.12.10dfsg-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - Added libjpeg8-dev build-dependency. (Closes: #598996) + - Bumped Standards-Version to 3.9.1, no changes needed. + - Reintroduced libzlui-maemo binary package and build dependencies. + * debian/rules: + - Reintroduced maemo actions. + + -- Eugene V. Lyubimkin Mon, 04 Oct 2010 19:47:39 +0300 + +fbreader (0.12.9dfsg-1) experimental; urgency=low + + * New upstream release. + * debian/NEWS: + - Added with notes about migration to 0.12. + * debian/control: + - Updated my mail address. + - Removed DMUA, it is not needed anymore. + - Added eReader to the list of supported formats. + - Temporarily removed libzlui-maemo binary package and build dependencies + for it until maemo support is ready. + - Dropped 'libzlui-qt' binary package. + - Bumped Standards-Version to 3.8.4, no changes needed. + - Changed the suffix of library packages from 0.10 to 0.12. + - Set minimum build-dependency libcurl version to 7.17 as per upstream + README.build. + - Added libsqlite3-dev build-dependency. + * debian/copyright: + - Updated copyright years. + * debian/patches: + - 930-use-shell-make-variable.patch: updated. + - 020-maemo-disable-libconic.patch: refreshed. + - 900-delete-useless-strip-flag.patch: refreshed. + - 930-use-shell-make-variable.patch: refreshed. + - 940-use-debian-compiler-flags.patch: refreshed. + + -- Eugene V. Lyubimkin Thu, 25 Mar 2010 19:58:30 +0200 + +fbreader (0.10.7dfsg-4) unstable; urgency=medium + + * debian/control: + - Use source:Version for dependencies on arch-independent packages. + Thanks to Julien Cristau for the report. Fixes FTBFS on BinNMUs. + (Closes: #596575) + - Updated my mail address. + - Removed DM-Upload-Allowed, not needed anymore. + + -- Eugene V. Lyubimkin Sun, 12 Sep 2010 21:23:29 +0300 + +fbreader (0.10.7dfsg-3) unstable; urgency=low + + * debian/control: + - Don't allow libzlui front-ends from previous series to be co-installed + with modern fbreader to prevent crashes. (Closes: #544138) + - Bumped Standards-Version to 3.8.3, no changes needed. + + -- Eugene V. Lyubimkin Sun, 30 Aug 2009 14:23:49 +0300 + +fbreader (0.10.7dfsg-2) unstable; urgency=low + + * debian/control: + - Fixed misspelled choice 'libzlui-qt' (Qt3 UI) in Depends. + + -- Eugene V. Lyubimkin Tue, 19 May 2009 11:21:39 +0300 + +fbreader (0.10.7dfsg-1) unstable; urgency=low + + * New upstream release, some changes: + - 0.10.7: + - A conflict between hyperlink clicks and touch scrolling has + been fixed. + - In maemo versions, empty menu items have been hidden. + - 0.10.6: + - A bug with images/css links in epub has been fixed. All the links + inside XHTML files were interpreted relative to the root OPF location + instead of XHTML file location. As a result, some images were not shown + in epub books. + - 0.10.5: + - The migration tool from version 0.8.* has been fixed. After an upgrade + from 0.8.* to this version, the first opening of your library will take + some time. + - A freeze (on some PDB books with more than one page and images, and + using small font size) has been fixed. + - Several text selection related issues have been fixed. + - 0.10.4: + - Maemo support is back. + - Multiple fixes in the epub format support. + * debian/control: + - Re-introduced libzlui-maemo binary package. + - Different minor versions of the same ui packages ('libzlui-*') are + incompatible between each other but have the same name, and it can cause + problems on upgrades. This is not a reliable behavior, so now + 'libzlui-*' packages don't provide 'libzlui' virtual package anymore. + Binary package 'fbreader' now strictly depends on same or newer binary + versions of one of 'libzlui-*' packages. (Closes: #521136) + - Bumped 'Standards-Version' to 3.8.1, no changes needed. + * debian/rules: + - Uncommented building maemo binaries. + * debian/dfsg-repack: + - Corrected to output usage when the parameter is not given. + * debian/patches: + - 005-maemo-makefile.patch: refreshed. + - New 020-maemo-disable-libconic.patch: disable libconic-related parts of + the maemo UI. Libconic depends on closed source, not even available + software. + - New 200-maemo-gtkentryparameter.patch: remove tuning-only hildon calls + that Debian GTK+ libraries cannot (yet?) satisfy. + - 930-use-shell-make-variable.patch: refreshed. + - debian/patches/940-use-debian-compiler-flags.patch: refreshed. + + -- Eugene V. Lyubimkin Fri, 01 May 2009 00:28:06 +0300 + +fbreader (0.10.3dfsg-1) experimental; urgency=low + + * New upstream release, some changes: + - 0.10.3: + - Some issues related to multi-file tar, tar.gz and tar.bz2 archives + have been fixed. + - 0.10.2: + - Images order in mobipocket files has been corrected. + - Indonesian localization files have been updated. + * debian/dfsg-repack: + - Corrected to produce correct orig.tar.gz. + * debian/patches: + - 005-maemo-makefile.patch: + - Refreshed. + + -- Eugene V. Lyubimkin Fri, 27 Feb 2009 21:26:25 +0200 + +fbreader (0.10.1dfsg-1) experimental; urgency=low + + * Repacked upstream tarball, removed non-DFSG hyphenation patterns (el, fi, + tr languages). See also README.source. + * debian/README.source: + - Added with reasons of excluding hyphenation patterns from upstream + tarball. + * debian/copyright: + - Renewed copyrights, thanks to Frank Lichtenheld. + - Fixed GPLv2 license path on Debian systems. + - Mentioned all Debian packaging contributors. + - Provided full license and copyright info for hyphenation patterns. + + -- Eugene V. Lyubimkin Wed, 04 Feb 2009 22:59:58 +0200 + +fbreader (0.10.1-1) experimental; urgency=low + + * New upstream release, some changes: + - Fixed never-ending loop under certain conditions when operating with + library and settings. + * debian/patches: + - 200-typo-in-searchonnetworkaction.patch: removed, went upstream. + + -- Eugene V. Lyubimkin Sun, 18 Jan 2009 16:06:20 +0200 + +fbreader (0.10.0-1) experimental; urgency=low + + * New upstream release, some changes: + - Searching and downloading books from www.feedbooks.com and + www.litres.ru. + - Partial CSS support for Epub files. + - Improved support for Epub and Mobipocket book formats. + - Added support for right-to-left languages and bidirectional text. + - Added Czech localization. + * debian/rules: + - Removed some old dh_makeshlibs magic for libzlcore and libzltext. + - Temporarily removed libzlui-maemo binary package until maemo support is + ready. + - Added build-deps: libfribidi-dev, libcurl4-gnutls-dev. + * debian/control: + - Bumped liblinebreak dependency version to 1.0. + - Made qt4 interface for fbreader the default one for new installs. + - Updated library binary package names '0.9' -> '0.10'. + - Removed some obsolete Conflicts and Replaces for libzlcore0.10 and + libzltext0.10. + - As GTK2 UI cannot substitute fonts, added Suggests on 'ttf-unifont' + for libzlui-gtk package. (Closes: #502040) + - Wrote up better short descriptions, modified a bit long description + for libzltext0.10. (Closes: #493616) + - Improved long description for the libzlcore-data package. + - Advanced fbreader long description according to new release. + - Added {misc:Depends} to Depends of all packages, fixing lintian + warnings. + - Removed duplicated 'Priority' fields from binary packages' entries. + - Divided architecture-independent data from package libzltext0.10 to its + own binary package (liblztext-data) as it leads to conflict problems + being in library package along .so files. + - Set DM-Upload-Allowed flag. + * debian/patches: + - 010-add-missing-headers.patch: deleted, went upstream. + - 100-fix-centering-with-margins.patch: deleted, went upstream. + - 910-remove-deprecated-fields-in-desktop-file.patch: deleted, went + upstream. + - New 200-typo-in-searchonnetworkaction.patch, cherry-picked from + upstream. + - Added comments to all Debian patches. + + -- Eugene V. Lyubimkin Tue, 13 Jan 2009 22:19:32 +0200 + +fbreader (0.8.17-12) unstable; urgency=low + + * debian/patches: + - New patch 930-use-shell-make-variable.patch. It allows to do 'make -jN'. + - New patch 940-use-debian-compiler-flags.patch. It allows to build + package with debian-specific flags. + * debian/rules: + - Added support for 'parallel=n' in DEB_BUILD_OPTIONS. + - Added support for 'noopt' in DEB_BUILD_OPTIONS. + - Now package builds with '-D_REENTRANT' flag. + * debian/control: + - Added missing dependency: libzlui-qt4 on libzlcore. + - Included SONAME's to library packages' names: + - Renamed 'libzlcore' package to 'libzlcore0.9'. + - Renamed 'libzltext' package to 'libzltext0.9'. + - Split arch-independent stuff from 'libzlcore' to 'libzlcore-data' + package. + - Fixed dependency: 'libzltext-dev' depends on 'libzltext', not + 'libzlcore'. + + -- Eugene V. Lyubimkin Sat, 12 Jul 2008 20:05:47 +0300 + +fbreader (0.8.17-11) unstable; urgency=low + + * debian/control: + - Enhanced all ZLibrary descriptions, not the main one. + - Done some renaming to use canonical names of libraries and toolkits in + decriptions, as suggested by developers-reference: + 'qt' -> 'Qt', 'gtk' -> 'GTK+', 'zlibrary' -> 'ZLibrary'. + - Bump 'Depends' on quilt to (>= 0.24). + * debian/rules: + - Included quilt makefile instead of quilt makefile instead + of copy&paste'ing it. + * debian/fbreader.links: + - Added this file to relay on dh_link's work instead of using 'ln -sf' + directly in the debian/rules. + + -- Eugene V. Lyubimkin Tue, 17 Jun 2008 23:01:53 +0300 + +fbreader (0.8.17-10) unstable; urgency=low + + * Switched to quilt patching system. + * debian/control: + - Enhanced description for libzlcore binary package. + - Added 'quilt' to Build-Depends. + * debian/rules: + - Removed unnecessary 'binary-indep', 'clean' rules. + - Added 'patch' and 'unpatch' rules. + + -- Eugene V. Lyubimkin Fri, 13 Jun 2008 14:01:27 +0300 + +fbreader (0.8.17-9) unstable; urgency=low + + * debian/control: + - Bump 'Standards-Version' to 3.8.0. No changes needed. + + -- Eugene V. Lyubimkin Wed, 11 Jun 2008 21:44:43 +0300 + +fbreader (0.8.17-8) unstable; urgency=low + + * debian/rules: + - Added creating symbolic links to provide lowercase-only path for + fbreader. (Closes: #434689) + + * Applied patch: removed obsolete 'Encoding' entry from fbreader desktop + file. + + -- Eugene V. Lyubimkin Mon, 02 Jun 2008 01:25:10 +0300 + +fbreader (0.8.17-7) unstable; urgency=low + + * Applied patch: correct centering text honoring margins. + (Closes: #475696) + + -- Eugene V. Lyubimkin Fri, 30 May 2008 03:13:20 +0300 + +fbreader (0.8.17-6) unstable; urgency=low + + * New maintainer. (Closes: #483257) + * debian/control: + - Updated "Maintainer:" field. + - Removed "Vcs-Git" field. + * debian/rules: + - Added empty 'binary-indep', 'clean' rules to satisfy lintian. + + -- Eugene V. Lyubimkin Wed, 28 May 2008 23:16:09 +0300 + +fbreader (0.8.17-5) unstable; urgency=low + + * debhelper v7, rules file minimisation + * Orphaned the package. + + -- Joey Hess Tue, 27 May 2008 19:18:07 -0400 + +fbreader (0.8.17-4) unstable; urgency=low + + * Use a newer version of liblinebreak-dev, which will properly link into + libzltext on more picky architectures. Closes: #475095 + + -- Joey Hess Tue, 08 Apr 2008 19:53:36 -0400 + +fbreader (0.8.17-3) unstable; urgency=low + + * Add b-d on liblinebreak-dev. Closes: #474805 + + -- Joey Hess Tue, 08 Apr 2008 17:28:05 -0400 + +fbreader (0.8.17-2) unstable; urgency=low + + * Header fix for gcc 4.3. Closes: #474805 + + -- Joey Hess Mon, 07 Apr 2008 17:47:04 -0400 + +fbreader (0.8.17-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Mon, 07 Apr 2008 12:29:01 -0400 + +fbreader (0.8.15-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Sun, 09 Mar 2008 17:50:31 -0400 + +fbreader (0.8.14-2) unstable; urgency=low + + * Fix missing include in maemo UI to allow building with gcc 4.3. + Closes: #466756 + + -- Joey Hess Wed, 20 Feb 2008 18:24:32 -0500 + +fbreader (0.8.14-1) unstable; urgency=low + + * New Upstream Version + + -- Joey Hess Mon, 11 Feb 2008 12:07:34 -0500 + +fbreader (0.8.13-1) unstable; urgency=low + + * New Upstream Version. Closes: #461813 + * Fixes orig tarball snafu. Closes: #462353 + + -- Joey Hess Sat, 09 Feb 2008 13:31:33 -0500 + +fbreader (0.8.12-3) unstable; urgency=low + + * Add libzlui-maemo which allows using fbreader on the maemo platform, on + Debian. Thanks, Riku Voipio. Closes: #462299 + * makefiles/arch/maemo.mk: Don't build with -thumb. (Riku) + * Loosen dependency versions some more, so it only depends on the current + upstream version or higher, ignoring the Debian revision. + * Use binary:Version instead of deprecated Source-Version. + + -- Joey Hess Wed, 23 Jan 2008 16:51:07 -0500 + +fbreader (0.8.12-2) unstable; urgency=low + + * Include dependency loosening changes. + + -- Joey Hess Tue, 22 Jan 2008 13:27:08 -0500 + +fbreader (0.8.12-1) unstable; urgency=low + + * New upstream version. Closes: #461813 + * Didn't include upstream's dependency changes yet. + + -- Joey Hess Mon, 21 Jan 2008 12:59:59 -0500 + +fbreader (0.8.11-1) stable; urgency=low + + * new upstream version + * dependency rules have been changed + + -- Nikolay Pultsin Sat, 12 Jan 2008 22:27:00 +0300 + +fbreader (0.8.10-1) stable; urgency=low + + * new upstream version + + -- Nikolay Pultsin Fri, 4 Jan 2008 20:53:00 +0300 + +fbreader (0.8.9-1) unstable; urgency=low + + * New Upstream Version + + -- Joey Hess Mon, 31 Dec 2007 11:40:17 -0500 + +fbreader (0.8.8a-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Tue, 18 Dec 2007 17:26:06 -0500 + +fbreader (0.8.8-2) unstable; urgency=low + + * Fix missing include to allow building with gcc 4.3. Closes: #456085 + + -- Joey Hess Thu, 13 Dec 2007 01:47:01 -0500 + +fbreader (0.8.8-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Tue, 04 Dec 2007 12:51:45 -0500 + +fbreader (0.8.7b-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Thu, 15 Nov 2007 19:21:34 -0500 + +fbreader (0.8.7-1) unstable; urgency=low + + [ Nikolay Pultsin ] + * new upstream version + + -- Joey Hess Fri, 26 Oct 2007 04:57:02 -0400 + +fbreader (0.8.6d-2) unstable; urgency=low + + * Change %U to %F in menu file, as fbreader does not support URLs. + Closes: #447971 + + -- Joey Hess Thu, 25 Oct 2007 13:36:19 -0400 + +fbreader (0.8.6d-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Sun, 09 Sep 2007 13:16:49 -0400 + +fbreader (0.8.6c-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Tue, 04 Sep 2007 20:22:41 -0400 + +fbreader (0.8.6b-1) unstable; urgency=low + + * Add real Homepage field. (Needs really new dpkg.) + * New upstream version. (Only Windows fixes.) + + -- Joey Hess Mon, 27 Aug 2007 13:17:47 -0400 + +fbreader (0.8.6a-2) unstable; urgency=low + + * Fix handling of nostrip build option. Closes: #436837 + + -- Joey Hess Sat, 11 Aug 2007 20:30:25 -0400 + +fbreader (0.8.6a-1) unstable; urgency=low + + [ Nikolay Pultsin ] + * new upstream version + * added libzlibrary-dev package + + [ Joey Hess ] + * Small changes to the new -dev packages. + * Upload to Debian. + + -- Joey Hess Wed, 08 Aug 2007 10:51:40 -0700 + +fbreader (0.8.5c-1) unstable; urgency=low + + * new upstream version + + -- Nikolay Pultsin Thu, 19 Jul 2007 15:20:00 +0400 + +fbreader (0.8.5b-1) unstable; urgency=low + + * new upstream version + * almost all changes from the previous change are now included into + the upstream version: zlibrary shared objects moving, rpath deletion, + and the man page. + + -- Nikolay Pultsin Tue, 10 Jul 2007 21:50:00 +0400 + +fbreader (0.8.5a-1) unstable; urgency=low + + * First upload to Debian. Closes: #432274 + * Misc debianisation changes. + * Move zlibrary shared object files to /usr/lib from /usr/share. + * Remove use of rpath. + * Use sensible-browser. + * Added a basic man page. + + -- Joey Hess Mon, 09 Jul 2007 15:04:31 -0400 + +fbreader (0.8.5-1) stable; urgency=low + + * new upstream version + + -- Nikolay Pultsin Sat, 7 Jul 2007 02:12:00 +0400 + +fbreader (0.8.4zz-1) stable; urgency=low + + * new upstream version + + -- Nikolay Pultsin Thu, 5 Jul 2007 03:17:00 +0400 + +fbreader (0.8.4z-2) stable; urgency=low + + * postinst/postrm scripts were added + + -- Nikolay Pultsin Fri, 29 Jun 2007 21:23:00 +0400 + +fbreader (0.8.4z-1) stable; urgency=low + + * Initial release. + + -- Nikolay Pultsin Fri, 29 Jun 2007 17:53:00 +0400 --- fbreader-0.12.10dfsg2.orig/debian/compat +++ fbreader-0.12.10dfsg2/debian/compat @@ -0,0 +1 @@ +9 --- fbreader-0.12.10dfsg2.orig/debian/control +++ fbreader-0.12.10dfsg2/debian/control @@ -0,0 +1,132 @@ +Source: fbreader +Section: text +Priority: optional +Maintainer: Eugene V. Lyubimkin +Standards-Version: 4.2.1 +Build-Depends: debhelper (>= 9), libgtk2.0-dev, libqt4-dev, libjpeg-dev, + libexpat1-dev, libbz2-dev, libz-dev, + libunibreak-dev, libfribidi-dev, libcurl4-gnutls-dev (>= 7.17), + quilt (>= 0.24), libsqlite3-dev +Homepage: http://www.fbreader.org/ + +Package: fbreader +Architecture: any +Replaces: fbreader-gtk, fbreader-qt, fbreader-qt4 +Depends: ${misc:Depends}, ${shlibs:Depends}, + libzlui-qt4 (>= ${binary:Version}) | libzlui-gtk (>= ${binary:Version}) +Recommends: sensible-utils +Breaks: libzlui-qt4 (<< 0.12), libzlui-gtk (<< 0.12), + libzlui-qt (<< 0.12), libzlui-maemo (<< 0.12) +Description: e-book reader + FBReader is an e-book reader. + . + Main features: + * supports several open e-book formats: fb2, html, chm, plucker, + palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed + mobipocket, plain text, epub, eReader + * reads directly from tar, zip, gzip, bzip2 archives (you can have + several books in one archive) + * supports a structured view of your e-book collection + * automatically determines encodings + * automatically generates a table of contents + * keeps the last open book and the last read positions for all open books + between runs + * automatic hyphenation (patterns for several languages are included) + * searching and downloading books from www.feedbooks.com and www.litres.ru + * partial CSS support for epub files + +Package: libzlcore0.13 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore-data (>= ${source:Version}) +Breaks: libzlcore0.12 +Replaces: libzlcore0.12 +Conflicts: fbreader-gtk, fbreader-qt, fbreader-qt4 +Description: ZLibrary cross-platform development library (shared library) + This is the core of ZLibrary, the library that the fbreader e-book reader + is based on. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzlcore-data +Section: libs +Architecture: all +Depends: ${misc:Depends} +Conflicts: libzlcore (<< 0.8.17-12) +Replaces: libzlcore (<< 0.8.17-12) +Description: ZLibrary cross-platform development library (support files) + This package contains the support files for the core of ZLibrary, the library + that the fbreader e-book reader is based on. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzltext0.13 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}), + libzltext-data (>= ${source:Version}) +Breaks: libzltext0.12 +Replaces: libzltext0.12 +Description: ZLibrary text model/viewer part (shared library) + This package provides text model/viewer part of ZLibrary. See also + libzlcore0.10 package. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzltext-data +Section: libs +Architecture: all +Depends: ${misc:Depends} +Conflicts: libzltext, libzltext0.9 +Replaces: libzltext, libzltext0.9 +Description: ZLibrary text model/viewer part (support files) + This package contains the support files for the text model/viewer part + of ZLibrary. See also libzltext0.10 package. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzlui-gtk +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}) +Suggests: ttf-unifont +Description: GTK+ interface module for ZLibrary + This package provides a GTK+-based UI for ZLibrary. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzlui-qt4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}) +Description: Qt4 interface module for ZLibrary + This package provides a Qt4-based UI for ZLibrary. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzlcore-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}) +Description: ZLibrary cross-platform development library (development files) + This package contains development files for the ZLibrary core. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. + +Package: libzltext-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libzltext0.13 (= ${binary:Version}) +Description: ZLibrary text model/viewer part (development files) + This package contains development files for the ZLibrary text model/viewer + library. + . + ZLibrary is a cross-platform library to build applications running on desktop + Linux, Windows, different Linux-based PDAs using this library. --- fbreader-0.12.10dfsg2.orig/debian/copyright +++ fbreader-0.12.10dfsg2/debian/copyright @@ -0,0 +1,570 @@ +This is the Debian prepackaged version of FBReader. + +It was originally Debianised by Nikolay Pultsin , and +later modified and improved by Joey Hess and +Eugene V. Lyubimkin . + +Sources are downloaded from its website at: + + http://www.fbreader.org/ + +It is copyright as follows: + +/* + * Copyright (C) 2004-2010 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +On Debian systems, the full text of the GPLv2 can be found in +/usr/share/common-licenses/GPL-2. + + +Hyphenation patterns (zlibrary/text/data/hyphenationPatterns.zip): + +Files fi.pattern, tr.pattern, el.pattern were removed from upstream tarball. +Check README.source to see why. You can reproduce removing procedure by using +script debian/dfsg-repack. + + +Files: cs.pattern +License: GPLv2+. + +Files: en.pattern +License: specific (follows) + +% Unlimited copying and redistribution of this file are permitted as long +% as this file is not modified. Modifications are permitted, but only if +% the resulting file is not named hyphen.tex. + +Files: de-traditional.pattern +License: Latex Project Public License 1+ +Copyrights: + +% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum +% [german hyphen patterns] +% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V. +% [macros, adaption for TeX 2] +% + +Files: de.pattern +License: Latex Project Public License 1+ +Copyrights: + +% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum +% [german hyphen patterns] +% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V. +% [macros, adaption for TeX 2] +% Copyright (C) 1998-2001 Walter Schmidt +% [adaption to new German orthography] +% + +Files: eo.pattern +License: Latex Project Public License 1+ +Copyrights: Copyright (C) 1999 Sergei B. Pokrovsky + +Files: es.pattern +License: Latex Project Public License +Copyrights: + +% (c) Javier Bezos 1993 1997. +% (c) Javier Bezos and CervanTeX 2001-2006 +% Some parts, (c) by Francesc Carmona + +Files: fr.pattern +License: specific (follows) + +% This file is available for free and can used and redistributed +% asis for free. Modified versions should have another name. + +Files: id.pattern +License: GPLv2 +Copyrights: (c) Copyright 1996, 1997 J\"org Knappen and Terry Mart + +Files: it.pattern +License: LGPLv2.1+ +Copyrights: Copyright 1998, 2007 Claudio Beccari + +Files: no.pattern: +Copyrights: Copyright (C) 2004, 2005 Rune Kleveland, Ole Michael Selberg. +License: specific (follows) + +% Copying and distribution of this file, with or without modification, +% are permitted in any medium without royalty provided the copyright +% notice and this notice are preserved. + +Files: pt.pattern: +License: Latex Project Public License 1+ +Copyrights: + +% (C) 1996 by Pedro J. de Rezende (rezende@dcc.unicamp.br) +% and J.Joao Dias Almeida (jj@di.uminho.pt) +% Version: 1.2 Release date: 21/07/96 +% +% (C) 1994 by Pedro J. de Rezende (rezende@dcc.unicamp.br) +% Version: 1.1 Release date: 04/12/94 +% +% (C) 1987 by Pedro J. de Rezende +% Version: 1.0 Release date: 02/13/87 + +Files: sv.pattern +License: Latex Project Public License 1.2+ +Copyrights: Copyright 1994 by Jan Michael Rynning. All rights reserved. + +Files: uk.pattern +License: Latex Project Public License 1+ +Copyrights: Copyright 1999 Andrij Shvaika + +Files: ru.pattern +License: Latex Project Public License 1.2+ +Copyrights: Copyright 1999-2003 Alexander I. Lebedev + + +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + + +LGPLv2.1 clause: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the full text of the LGPLv2.1 can be found in +/usr/share/common-licenses/LGPL-2.1. --- fbreader-0.12.10dfsg2.orig/debian/dfsg-repack +++ fbreader-0.12.10dfsg2/debian/dfsg-repack @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +# This script removes non-dfsg files from upstream tarball. +# Requires package 'zip' to be installed + +ORIG_TARBALL=$1 +if [ -z $ORIG_TARBALL ]; then + echo "Usage: $0 " + exit 1 +fi + +ZIP_FILE=zlibrary/text/data/hyphenationPatterns.zip +FORMAT_DATA_DIR=fbreader/data/formats + +REPACK_DIR=./tmp-fbreader-repack +mkdir -p $REPACK_DIR + +tar -C $REPACK_DIR -xzf $ORIG_TARBALL +UPSTREAM_DIR=`ls -1 $REPACK_DIR/`; \ +(cd $REPACK_DIR && \ + zip -d $UPSTREAM_DIR/$ZIP_FILE "el.pattern" "fi.pattern" "tr.pattern"; \ + rm $UPSTREAM_DIR/$FORMAT_DATA_DIR/xhtml/* + rm $UPSTREAM_DIR/$FORMAT_DATA_DIR/docbook/* + + mv $UPSTREAM_DIR ${UPSTREAM_DIR}.orig; +) + +tar -C $REPACK_DIR -cf - ${UPSTREAM_DIR}.orig | + gzip --best -c > $ORIG_TARBALL.dfsg2 + +rm -r $REPACK_DIR --- fbreader-0.12.10dfsg2.orig/debian/fbreader.links +++ fbreader-0.12.10dfsg2/debian/fbreader.links @@ -0,0 +1,2 @@ +usr/bin/FBReader usr/bin/fbreader +usr/share/man/man1/FBReader.1.gz usr/share/man/man1/fbreader.1.gz --- fbreader-0.12.10dfsg2.orig/debian/libzlcore-data.dirs +++ fbreader-0.12.10dfsg2/debian/libzlcore-data.dirs @@ -0,0 +1 @@ +usr/share/zlibrary --- fbreader-0.12.10dfsg2.orig/debian/libzlcore0.13.dirs +++ fbreader-0.12.10dfsg2/debian/libzlcore0.13.dirs @@ -0,0 +1 @@ +usr/lib --- fbreader-0.12.10dfsg2.orig/debian/libzltext-data.dirs +++ fbreader-0.12.10dfsg2/debian/libzltext-data.dirs @@ -0,0 +1 @@ +usr/share/zlibrary --- fbreader-0.12.10dfsg2.orig/debian/libzltext0.13.dirs +++ fbreader-0.12.10dfsg2/debian/libzltext0.13.dirs @@ -0,0 +1 @@ +usr/lib --- fbreader-0.12.10dfsg2.orig/debian/manpages +++ fbreader-0.12.10dfsg2/debian/manpages @@ -0,0 +1 @@ +fbreader/desktop/FBReader.1 --- fbreader-0.12.10dfsg2.orig/debian/patches/0001-110-use-sensible-browser.patch +++ fbreader-0.12.10dfsg2/debian/patches/0001-110-use-sensible-browser.patch @@ -0,0 +1,22 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 110-use-sensible-browser + +Use sensible-browser instead of "mozilla". +--- + fbreader/data/default/external.desktop.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fbreader/data/default/external.desktop.xml b/fbreader/data/default/external.desktop.xml +index dfa18ed..811a580 100644 +--- a/fbreader/data/default/external.desktop.xml ++++ b/fbreader/data/default/external.desktop.xml +@@ -3,7 +3,7 @@ +
+ + +- +
+ --- fbreader-0.12.10dfsg2.orig/debian/patches/0002-400-fix-building-with-gcc46.patch +++ fbreader-0.12.10dfsg2/debian/patches/0002-400-fix-building-with-gcc46.patch @@ -0,0 +1,21 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 400-fix-building-with-gcc46 + +--- + fbreader/src/library/Library.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fbreader/src/library/Library.cpp b/fbreader/src/library/Library.cpp +index 844905c..ad1e4ec 100644 +--- a/fbreader/src/library/Library.cpp ++++ b/fbreader/src/library/Library.cpp +@@ -39,7 +39,7 @@ + shared_ptr Library::ourInstance; + const size_t Library::MaxRecentListSize = 10; + +-Library::Library &Library::Instance() { ++Library &Library::Instance() { + if (ourInstance.isNull()) { + ourInstance = new Library(); + } --- fbreader-0.12.10dfsg2.orig/debian/patches/0003-600-fix-ftell-crash.patch +++ fbreader-0.12.10dfsg2/debian/patches/0003-600-fix-ftell-crash.patch @@ -0,0 +1,29 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 600-fix-ftell-crash + +If myBaseStream->open() failed (i.e. result == false), calling +myBaseStream->offset() may attempt to call ftell() on an invalid file +descriptor which may lead to a crash. + +See also https://github.com/geometer/FBReader/issues/224. +--- + zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp b/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp +index b44cf9a..b0b65b9 100644 +--- a/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp ++++ b/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp +@@ -24,7 +24,10 @@ ZLInputStreamDecorator::ZLInputStreamDecorator(shared_ptr decorat + + bool ZLInputStreamDecorator::open() { + bool result = myBaseStream->open(); +- myBaseOffset = myBaseStream->offset(); ++ if (result) ++ { ++ myBaseOffset = myBaseStream->offset(); ++ } + return result; + } + --- fbreader-0.12.10dfsg2.orig/debian/patches/0004-900-delete-useless-strip-flag.patch +++ fbreader-0.12.10dfsg2/debian/patches/0004-900-delete-useless-strip-flag.patch @@ -0,0 +1,22 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 900-delete-useless-strip-flag + +Don't strip fbreader binary directly after building, dh_strip will do it. +--- + makefiles/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefiles/config.mk b/makefiles/config.mk +index 84ad7d6..b4048ae 100644 +--- a/makefiles/config.mk ++++ b/makefiles/config.mk +@@ -28,7 +28,7 @@ endif + + ifeq "$(TARGET_STATUS)" "release" + CFLAGS += -O3 +- LDFLAGS += -s ++# LDFLAGS += -s # dh_strip will strip it in Debian --JEH + endif + ifeq "$(TARGET_STATUS)" "debug" + CFLAGS += -O0 -g --- fbreader-0.12.10dfsg2.orig/debian/patches/0005-910-zlui-qt4-links-to-QtCore.patch +++ fbreader-0.12.10dfsg2/debian/patches/0005-910-zlui-qt4-links-to-QtCore.patch @@ -0,0 +1,22 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 910-zlui-qt4-links-to-QtCore + +=================================================================== +--- + makefiles/arch/desktop.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk +index b8499d5..357f2ce 100644 +--- a/makefiles/arch/desktop.mk ++++ b/makefiles/arch/desktop.mk +@@ -28,7 +28,7 @@ ifeq "$(UI_TYPE)" "qt" + endif + + ifeq "$(UI_TYPE)" "qt4" +- UILIBS = -lQtGui ++ UILIBS = -lQtCore -lQtGui + endif + + ifeq "$(UI_TYPE)" "gtk" --- fbreader-0.12.10dfsg2.orig/debian/patches/0006-930-use-shell-make-variable.patch +++ fbreader-0.12.10dfsg2/debian/patches/0006-930-use-shell-make-variable.patch @@ -0,0 +1,117 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 930-use-shell-make-variable + +Use shell MAKE variable to allow parallel builds. +--- + Makefile | 6 +++--- + fbreader/Makefile | 4 ++-- + zlibrary/core/Makefile | 2 +- + zlibrary/text/Makefile | 2 +- + zlibrary/ui/Makefile | 6 +++--- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 1c99c2e..df3706f 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,21 +21,21 @@ install: all do_install + do_install: + @for dir in $(ZLIBDIRS) $(APPDIRS); do \ + if [ -d $$dir ]; then \ +- cd $$dir; make $@; cd $(ROOTDIR); \ ++ cd $$dir; $(MAKE) $@; cd $(ROOTDIR); \ + fi; \ + done + + do_install_dev: + @for dir in $(ZLIBDIRS); do \ + if [ -d $$dir ]; then \ +- cd $$dir; make $@; cd $(ROOTDIR); \ ++ cd $$dir; $(MAKE) $@; cd $(ROOTDIR); \ + fi; \ + done + + clean: + @for dir in $(ZLIBDIRS) $(APPDIRS); do \ + if [ -d $$dir ]; then \ +- cd $$dir; make $@; cd $(ROOTDIR); \ ++ cd $$dir; $(MAKE) $@; cd $(ROOTDIR); \ + fi; \ + done + +diff --git a/fbreader/Makefile b/fbreader/Makefile +index 0a3e6ea..6efc10b 100644 +--- a/fbreader/Makefile ++++ b/fbreader/Makefile +@@ -61,13 +61,13 @@ do_install: + @install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) + @install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) + @install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) +- @make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install ++ @$(MAKE) -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install + + clean: + @for subdir in $(ALL_SUBDIRS); do \ + $(MAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk clean; \ + done; + @for subdir in $(ALL_ARCHSUBDIRS); do \ +- cd $$subdir; make clean; cd ..; \ ++ cd $$subdir; $(MAKE) clean; cd ..; \ + done; + @$(RM) $(TARGET) err +diff --git a/zlibrary/core/Makefile b/zlibrary/core/Makefile +index 7cb359b..a0e7735 100644 +--- a/zlibrary/core/Makefile ++++ b/zlibrary/core/Makefile +@@ -38,7 +38,7 @@ else + endif + + .objects: +- @for subdir in $(SUBDIRS); do \ ++ +@for subdir in $(SUBDIRS); do \ + if [ -d $$subdir ]; then \ + if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \ + exit 1; \ +diff --git a/zlibrary/text/Makefile b/zlibrary/text/Makefile +index 021e71e..551308e 100644 +--- a/zlibrary/text/Makefile ++++ b/zlibrary/text/Makefile +@@ -22,7 +22,7 @@ endif + SUBDIRS = src/model src/area src/view src/style src/styleOptions src/hyphenation + + .objects: +- @for subdir in $(SUBDIRS); do \ ++ +@for subdir in $(SUBDIRS); do \ + if [ -d $$subdir ]; then \ + if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \ + exit 1; \ +diff --git a/zlibrary/ui/Makefile b/zlibrary/ui/Makefile +index 83cb042..59fdcf0 100644 +--- a/zlibrary/ui/Makefile ++++ b/zlibrary/ui/Makefile +@@ -84,21 +84,21 @@ ifeq "$(UI_TYPE)" "win32" + endif + + .objects: +- @for subdir in $(SUBDIRS); do \ ++ +@for subdir in $(SUBDIRS); do \ + if [ -d $$subdir ]; then \ + if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \ + exit 1; \ + fi; \ + fi; \ + done; +- @for subdir in $(QTSUBDIRS); do \ ++ +@for subdir in $(QTSUBDIRS); do \ + if [ -d $$subdir ]; then \ + if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/qsubdir.mk; then \ + exit 1; \ + fi; \ + fi; \ + done; +- @for subdir in $(GTKSUBDIRS); do \ ++ +@for subdir in $(GTKSUBDIRS); do \ + if [ -d $$subdir ]; then \ + if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/gtksubdir.mk; then \ + exit 1; \ --- fbreader-0.12.10dfsg2.orig/debian/patches/0007-950-link-to-libunibreak.patch +++ fbreader-0.12.10dfsg2/debian/patches/0007-950-link-to-libunibreak.patch @@ -0,0 +1,22 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 950-link-to-libunibreak + +=================================================================== +--- + zlibrary/text/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zlibrary/text/Makefile b/zlibrary/text/Makefile +index 551308e..665705a 100644 +--- a/zlibrary/text/Makefile ++++ b/zlibrary/text/Makefile +@@ -34,7 +34,7 @@ $(TARGET): .objects + @echo -n 'Creating $@ ...' + @$(RM_QUIET) $(TARGET) + ifeq "$(ZLSHARED)" "yes" +- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi ++ @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -lunibreak -lfribidi + #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -llinebreak -lfribidi + @ln -sf $(TARGET) $(TARGET_SONAME) + @ln -sf $(TARGET) $(TARGET_SHORTNAME) --- fbreader-0.12.10dfsg2.orig/debian/patches/0008-951-fix-calling-compiler.patch +++ fbreader-0.12.10dfsg2/debian/patches/0008-951-fix-calling-compiler.patch @@ -0,0 +1,101 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:20:25 +0100 +Subject: 951-fix-calling-compiler + +=================================================================== +--- + makefiles/arch/desktop.mk | 3 +-- + makefiles/gtksubdir.mk | 8 ++------ + makefiles/platforms.mk | 4 +--- + makefiles/qsubdir.mk | 8 ++------ + makefiles/subdir.mk | 9 +-------- + 5 files changed, 7 insertions(+), 25 deletions(-) + +diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk +index 357f2ce..78211a8 100644 +--- a/makefiles/arch/desktop.mk ++++ b/makefiles/arch/desktop.mk +@@ -10,8 +10,7 @@ CC = gcc + AR = ar rsu + LD = g++ + +-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG +-LDFLAGS = ++CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG + + ifeq "$(UI_TYPE)" "qt" + MOC = moc-qt3 +diff --git a/makefiles/gtksubdir.mk b/makefiles/gtksubdir.mk +index aed94f3..23f51da 100644 +--- a/makefiles/gtksubdir.mk ++++ b/makefiles/gtksubdir.mk +@@ -11,14 +11,10 @@ OBJECTS += $(patsubst %.cpp, %.o, $(SOURCES)) + .SUFFIXES: .c .cpp .o .h + + .c.o: +- @echo -n 'Compiling $@ ...' +- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< +- @echo ' OK' ++ $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $(INCLUDE) $< + + .cpp.o: +- @echo -n 'Compiling $@ ...' +- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< +- @echo ' OK' ++ $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDE) $< + + all: $(OBJECTS) + +diff --git a/makefiles/platforms.mk b/makefiles/platforms.mk +index df83885..129463b 100644 +--- a/makefiles/platforms.mk ++++ b/makefiles/platforms.mk +@@ -10,6 +10,4 @@ ifeq "$(UI_TYPE)" "" + $(error UI_TYPE is not defined. Please edit $(ROOTDIR)/makefiles/target.mk) + endif + +-ifeq "$(TARGET_STATUS)" "" +- TARGET_STATUS = release +-endif ++TARGET_STATUS = "" # Debian packaging always set flags itself +diff --git a/makefiles/qsubdir.mk b/makefiles/qsubdir.mk +index 14b4efc..f6ec87b 100644 +--- a/makefiles/qsubdir.mk ++++ b/makefiles/qsubdir.mk +@@ -11,14 +11,10 @@ OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES)) + .SUFFIXES: .cpp .moc.cpp .moc.o .o .h + + .cpp.o: +- @echo -n 'Compiling $@ ...' +- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< +- @echo ' OK' ++ $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDE) $< + + .h.moc.cpp: +- @echo -n 'Generating $@ ...' +- @$(MOC) $< -o $@ +- @echo ' OK' ++ $(MOC) $< -o $@ + + all: $(OBJECTS) $(OBJMOC) + +diff --git a/makefiles/subdir.mk b/makefiles/subdir.mk +index b364211..63e66bf 100644 +--- a/makefiles/subdir.mk ++++ b/makefiles/subdir.mk +@@ -11,14 +11,7 @@ OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES_CPP)) $(patsubst %.M, %.o, $(SOURCES_ + .SUFFIXES: .cpp .M .m .o .h + + .cpp.o: +- @echo -n 'Compiling $@ ...' +-ifdef CFLAGS_NOARCH +- @$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .cpp`.d +- @$(CC) -c $(CFLAGS) $(INCLUDE) $< +-else +- @$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $< +-endif +- @echo ' OK' ++ $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDE) $< + + .M.o: + @echo -n 'Compiling $@ ...' --- fbreader-0.12.10dfsg2.orig/debian/patches/0009-fbreader-Makefile-do-not-try-to-install-empty-format.patch +++ fbreader-0.12.10dfsg2/debian/patches/0009-fbreader-Makefile-do-not-try-to-install-empty-format.patch @@ -0,0 +1,22 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 20 Feb 2016 18:23:10 +0100 +Subject: fbreader: Makefile: do not try to install empty formats/xhtml + directory + +--- + fbreader/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/fbreader/Makefile b/fbreader/Makefile +index 6efc10b..ba247b7 100644 +--- a/fbreader/Makefile ++++ b/fbreader/Makefile +@@ -44,8 +44,6 @@ do_install: + @install -m 0644 $(wildcard data/network/certificates/*.crt) $(FBSHAREDIR)/network/certificates + @install -d $(FBSHAREDIR)/formats/html + @install -m 0644 data/formats/html/html.ent $(FBSHAREDIR)/formats/html +- @install -d $(FBSHAREDIR)/formats/xhtml +- @install -m 0644 $(wildcard data/formats/xhtml/*.ent) $(FBSHAREDIR)/formats/xhtml + @install -d $(FBSHAREDIR)/formats/fb2 + @sed "s/VERSION/$(VERSION)/" data/formats/fb2/FBReaderVersion.ent > $(FBSHAREDIR)/formats/fb2/FBReaderVersion.ent + @install -m 0644 data/formats/fb2/fb2genres.xml $(FBSHAREDIR)/formats/fb2 --- fbreader-0.12.10dfsg2.orig/debian/patches/0010-booksdb-avoid-converting-boolean-to-shared_ptr.patch +++ fbreader-0.12.10dfsg2/debian/patches/0010-booksdb-avoid-converting-boolean-to-shared_ptr.patch @@ -0,0 +1,22 @@ +From: "Eugene V. Lyubimkin" +Date: Sun, 24 Jul 2016 11:03:52 +0200 +Subject: booksdb: avoid converting boolean to shared_ptr + +GCC6 doesn't like it. +--- + fbreader/src/database/booksdb/BooksDB.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp +index 3a37640..2bbb37c 100644 +--- a/fbreader/src/database/booksdb/BooksDB.cpp ++++ b/fbreader/src/database/booksdb/BooksDB.cpp +@@ -145,7 +145,7 @@ shared_ptr BooksDB::loadBook(const std::string &fileName) { + + myFindFileId->setFileName(fileName); + if (!myFindFileId->run()) { +- return false; ++ return 0; + } + ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId(); + shared_ptr reader = myLoadBook->executeReader(); --- fbreader-0.12.10dfsg2.orig/debian/patches/0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch.patch +++ fbreader-0.12.10dfsg2/debian/patches/0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch.patch @@ -0,0 +1,32 @@ +From: "Eugene V. Lyubimkin" +Date: Sun, 9 Dec 2018 16:31:45 +0100 +Subject: zlibrary: unix: curl: avoid duplicate case in a switch + +CURLE_SSL_CACERT was merged into CURLE_PEER_FAILED_VERIFICATION, see [1] + +[1] https://github.com/curl/curl/commit/3f3b26d6feb0667714902e836af608094235fca2 +--- + zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +index a75d8bc..55865b6 100644 +--- a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp ++++ b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +@@ -277,16 +277,9 @@ std::string ZLCurlNetworkManager::perform(const ZLExecutionData::Vector &dataLis + case CURLE_SSL_CONNECT_ERROR: + errors.insert(ZLStringUtil::printf(errorResource["sslConnectErrorMessage"].value(), curl_easy_strerror(CURLE_SSL_CONNECT_ERROR))); + break; +-#if LIBCURL_VERSION_NUM > 0x071100 + case CURLE_PEER_FAILED_VERIFICATION: +-#else +- case CURLE_SSL_PEER_CERTIFICATE: +-#endif + errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; +- case CURLE_SSL_CACERT: +- errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); +- break; + case CURLE_SSL_CACERT_BADFILE: + errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path)); + break; --- fbreader-0.12.10dfsg2.orig/debian/patches/0012-makefiles-use-externally-passed-PKG_CONFIG-if-availa.patch +++ fbreader-0.12.10dfsg2/debian/patches/0012-makefiles-use-externally-passed-PKG_CONFIG-if-availa.patch @@ -0,0 +1,39 @@ +From: "Eugene V. Lyubimkin" +Date: Sun, 9 Dec 2018 16:37:16 +0100 +Subject: makefiles: use externally-passed PKG_CONFIG if available + +Patch by Helmut Grohne. +--- + makefiles/arch/desktop.mk | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk +index 78211a8..fe3238a 100644 +--- a/makefiles/arch/desktop.mk ++++ b/makefiles/arch/desktop.mk +@@ -9,6 +9,7 @@ APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME% + CC = gcc + AR = ar rsu + LD = g++ ++PKG_CONFIG ?= pkg-config + + CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG + +@@ -20,7 +21,7 @@ else + QTINCLUDE = -I /usr/include/qt4 + endif + +-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft) ++GTKINCLUDE = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 libpng xft) + + ifeq "$(UI_TYPE)" "qt" + UILIBS = -lqt-mt +@@ -31,7 +32,7 @@ ifeq "$(UI_TYPE)" "qt4" + endif + + ifeq "$(UI_TYPE)" "gtk" +- UILIBS = $(shell pkg-config --libs gtk+-2.0) -lpng -ljpeg ++ UILIBS = $(shell $(PKG_CONFIG) --libs gtk+-2.0) -lpng -ljpeg + endif + + RM = rm -rvf --- fbreader-0.12.10dfsg2.orig/debian/patches/series +++ fbreader-0.12.10dfsg2/debian/patches/series @@ -0,0 +1,12 @@ +0001-110-use-sensible-browser.patch +0002-400-fix-building-with-gcc46.patch +0003-600-fix-ftell-crash.patch +0004-900-delete-useless-strip-flag.patch +0005-910-zlui-qt4-links-to-QtCore.patch +0006-930-use-shell-make-variable.patch +0007-950-link-to-libunibreak.patch +0008-951-fix-calling-compiler.patch +0009-fbreader-Makefile-do-not-try-to-install-empty-format.patch +0010-booksdb-avoid-converting-boolean-to-shared_ptr.patch +0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch.patch +0012-makefiles-use-externally-passed-PKG_CONFIG-if-availa.patch --- fbreader-0.12.10dfsg2.orig/debian/rules +++ fbreader-0.12.10dfsg2/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + AUXMAKEFLAGS += -j$(NUMJOBS) +endif + +DPKG_EXPORT_BUILDFLAGS=1 +include /usr/share/dpkg/architecture.mk +include /usr/share/dpkg/buildflags.mk + +DEB_DIR = $(CURDIR)/debian + +export PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config +AUXMAKEFLAGS += 'LD=$$(CXX)' + +%: + dh $@ --with quilt + +override_dh_auto_build: + dh_auto_build -- $(AUXMAKEFLAGS) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy + dh_auto_build -- $(AUXMAKEFLAGS) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy + dh_auto_build -- $(AUXMAKEFLAGS) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk + dh_auto_build -- $(AUXMAKEFLAGS) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 + dh_auto_build -- $(AUXMAKEFLAGS) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy + +install-common: + $(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/tmp/zlcore do_install + $(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/tmp/zltext do_install + +override_dh_auto_install-indep: install-common + mv $(DEB_DIR)/tmp/zlcore/usr/share/zlibrary $(DEB_DIR)/libzlcore-data/usr/share + mv $(DEB_DIR)/tmp/zltext/usr/share/zlibrary $(DEB_DIR)/libzltext-data/usr/share + +override_dh_auto_install-arch: install-common + mv $(DEB_DIR)/tmp/zlcore/usr/lib $(DEB_DIR)/libzlcore0.13/usr + mv $(DEB_DIR)/tmp/zltext/usr/lib $(DEB_DIR)/libzltext0.13/usr + $(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzlcore-dev do_install_dev + $(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext-dev do_install_dev + $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk DESTDIR=$(DEB_DIR)/libzlui-gtk do_install + $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 DESTDIR=$(DEB_DIR)/libzlui-qt4 do_install + $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/fbreader do_install + +override_dh_makeshlibs: + dh_makeshlibs -plibzlcore0.13 + dh_makeshlibs -plibzltext0.13 + +include /usr/share/quilt/quilt.make + --- fbreader-0.12.10dfsg2.orig/debian/source/format +++ fbreader-0.12.10dfsg2/debian/source/format @@ -0,0 +1 @@ +1.0 --- fbreader-0.12.10dfsg2.orig/debian/watch +++ fbreader-0.12.10dfsg2/debian/watch @@ -0,0 +1,3 @@ +version=2 +opts=dversionmangle=s/dfsg\d*$// \ + http://www.fbreader.org/downloads.php fbreader-sources-(.*).tgz