diff -Nru scribus-1.4.4+dfsg1/debian/changelog scribus-1.4.4+dfsg1/debian/changelog --- scribus-1.4.4+dfsg1/debian/changelog 2014-09-13 09:28:39.000000000 +0000 +++ scribus-1.4.4+dfsg1/debian/changelog 2014-10-20 19:01:54.000000000 +0000 @@ -1,3 +1,18 @@ +scribus (1.4.4+dfsg1-2) unstable; urgency=medium + + * [a780c7d] Use /usr/share/hyphen to provide hyphenator dicts: + + debian/control: + - promote hyphen-hyphenation-patterns from suggests to recommends. + + debian/patches/762942: + - allow the use of symlinks in the directory used to pick up dicts. + + debian/scribus.links: + - link usr/share/hyphen → usr/share/scribus/dicts. + + Closes: #762942 + * [3590799] debian/control: bump standards-version to 3.9.6. + * [7b37ea0] debian/rules: use gzip -n to allow reproducibily building. + + -- Mattia Rizzolo Mon, 20 Oct 2014 21:01:51 +0200 + scribus (1.4.4+dfsg1-1) unstable; urgency=medium * [54f1b99] Imported Upstream version 1.4.4+dfsg1. (Closes: #747814) diff -Nru scribus-1.4.4+dfsg1/debian/control scribus-1.4.4+dfsg1/debian/control --- scribus-1.4.4+dfsg1/debian/control 2014-08-25 07:51:48.000000000 +0000 +++ scribus-1.4.4+dfsg1/debian/control 2014-10-11 19:50:21.000000000 +0000 @@ -18,7 +18,7 @@ libxml2-dev (>= 2.6.16), python-all-dev (>= 2.6.6-3~), zlib1g-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/collab-maint/scribus.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/scribus.git Homepage: http://www.scribus.net @@ -32,11 +32,11 @@ ${shlibs:Depends} Recommends: cups-bsd, fonts-liberation, + hyphen-hyphenation-patterns, icc-profiles-free, ttf-bitstream-vera, xfonts-scalable | gsfonts-x11 -Suggests: hyphen-hyphenation-patterns, - icc-profiles, +Suggests: icc-profiles, scribus-doc, scribus-template, texlive-latex-recommended diff -Nru scribus-1.4.4+dfsg1/debian/patches/762942 scribus-1.4.4+dfsg1/debian/patches/762942 --- scribus-1.4.4+dfsg1/debian/patches/762942 1970-01-01 00:00:00.000000000 +0000 +++ scribus-1.4.4+dfsg1/debian/patches/762942 2014-10-11 19:49:26.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Allow the use of others hyphenators files. + The idea here is to allow the use of hyphenator dictionaries presents in + /usr/share/hyphen through a symlink from /usr/share/scribus/dicts. + It's clearly a workaround- +Author: Mattia Rizzolo +Forwarded: not-needed, but looks like upstream don't want it +Bug: http://bugs.scribus.net/view.php?id=8157 +Bug-Debian: https://bugs.debian.org/533081 +Bug-Debian: https://bugs.debian.org/762942 +Last-Update: 2014-10-11 + +--- a/scribus/scribus.cpp ++++ b/scribus/scribus.cpp +@@ -7935,7 +7935,7 @@ + delete dia; + QFile::remove(prefsManager->preferencesLocation()+"/tmp.ps"); + QFile::remove(prefsManager->preferencesLocation()+"/sc.png"); +- QDir d(prefsManager->preferencesLocation()+"/", "sc.*", QDir::Name, QDir::Files | QDir::NoSymLinks); ++ QDir d(prefsManager->preferencesLocation()+"/", "sc.*", QDir::Name, QDir::Files); + if ((d.exists()) && (d.count() != 0)) + { + for (uint dc = 0; dc < d.count(); dc++) diff -Nru scribus-1.4.4+dfsg1/debian/patches/series scribus-1.4.4+dfsg1/debian/patches/series --- scribus-1.4.4+dfsg1/debian/patches/series 2014-07-28 16:29:15.000000000 +0000 +++ scribus-1.4.4+dfsg1/debian/patches/series 2014-10-11 19:51:07.000000000 +0000 @@ -1,3 +1,4 @@ +762942 remove_non-free_file.patch qreal_double.patch hyphen-used-as-minus-sign.patch diff -Nru scribus-1.4.4+dfsg1/debian/rules scribus-1.4.4+dfsg1/debian/rules --- scribus-1.4.4+dfsg1/debian/rules 2014-08-25 07:51:48.000000000 +0000 +++ scribus-1.4.4+dfsg1/debian/rules 2014-10-11 19:29:18.000000000 +0000 @@ -38,7 +38,7 @@ -e 's/Arial Regular/Liberation Sans Regular/g' \ -e 's/Arial Black Regular/Liberation Sans Bold/g' \ -e 's/FreeSans Medium/Liberation Sans Bold/g' - gzip -v -8 $(CURDIR)/debian/scribus/usr/share/scribus/templates/*/*.sla + gzip -v -n -8 $(CURDIR)/debian/scribus/usr/share/scribus/templates/*/*.sla override_dh_fixperms: dh_fixperms diff -Nru scribus-1.4.4+dfsg1/debian/scribus.links scribus-1.4.4+dfsg1/debian/scribus.links --- scribus-1.4.4+dfsg1/debian/scribus.links 2014-08-25 07:51:48.000000000 +0000 +++ scribus-1.4.4+dfsg1/debian/scribus.links 2014-10-11 17:48:42.000000000 +0000 @@ -1 +1,2 @@ +usr/share/hyphen usr/share/scribus/dicts usr/share/doc/scribus/copyright usr/share/doc/scribus/COPYING