From: Bastien Roucariès Date: Tue, 4 Dec 2012 12:32:20 +0000 (+0000) Subject: Import kbibtex_0.4-4.debian.tar.gz X-Git-Tag: archive/raspbian/0.9.90-1+rpi1~1^2^2^2~6^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=324d902a50e0704dda64ce58e09b865193218e90;p=kbibtex.git Import kbibtex_0.4-4.debian.tar.gz [dgit import tarball kbibtex 0.4-4 kbibtex_0.4-4.debian.tar.gz] --- 324d902a50e0704dda64ce58e09b865193218e90 diff --git a/changelog b/changelog new file mode 100644 index 0000000..2a7d12a --- /dev/null +++ b/changelog @@ -0,0 +1,208 @@ +kbibtex (0.4-4) unstable; urgency=low + + * Fix dataloss affecting doi fields more then one slash, thanks to + David Wagner (Closes: #694782). + + -- Bastien Roucariès Tue, 04 Dec 2012 13:32:20 +0100 + +kbibtex (0.4-3) unstable; urgency=low + + * Adopt kbibtex (Closes: #654750) + * Bug fix: "New kbibtex destroys localfile information" (Closes: #644024). + * Bug fix: "Spelling error in control file (ressources >> resources) in + control file, thanks to Clayton Casciato (Closes: #687353). + + -- Bastien Roucariès Mon, 05 Nov 2012 11:46:07 +0100 + +kbibtex (0.4-2) unstable; urgency=low + + * Add patch to fix FTBFS with GCC 4.7 -- mising include (Closes: #664924). + Courtesy of Sebastian Ramacher. + + -- Michael Hanke Sun, 13 May 2012 20:15:17 +0200 + +kbibtex (0.4-1) unstable; urgency=low + + * New upstream release. + * Add patch to disable -Wcast-align flag to prevent a (presumably) + false-positive warning to cause a FTBFS (Closes: #647030). + * Adjust debian/copyright to include a standalone paragraph for the GPL-2. + * Added patch to allow compiling with latest GCC (missing header includes). + + -- Michael Hanke Thu, 15 Dec 2011 03:43:34 +0100 + +kbibtex (0.4~beta1-1) unstable; urgency=low + + * New upstream release (Closes: #643751). Most search engines from the 0.2 + series are back. Does not modify 'localfile' fields in BibTeX entries + anymore (Closes: #644024). + * Adjust watch file for 0.4 series. + * Update debian/copyright and migrate to DEP5-compliant format. + * Added rudimentary git-buildpackage configuration. + * Add patch that removes an unnecessary xdg-open interpreter shebang from + kbibtex.desktop. + + -- Michael Hanke Sun, 02 Oct 2011 09:14:19 +0200 + +kbibtex (0.3-1) unstable; urgency=low + + * First upstream release for KDE4 (Closes: #634255). A number of search + engines are still missing, in comparison to the 0.2 series. + * Bumped Standards-Version to 3.9.2, no changes necessary. + + -- Michael Hanke Mon, 18 Jul 2011 09:29:48 -0400 + +kbibtex (0.3~beta1+svn561-1) experimental; urgency=low + + * New upstream code for KDE4/Qt4 port (Closes: #604279). + + -- Michael Hanke Sun, 13 Mar 2011 21:23:22 -0400 + +kbibtex (0.2.3.90-1) unstable; urgency=low + + * New upstream release (Closes: #563684). + * Switch to source package version 3.0 (quilt). + * Bumped Standards-Version to 3.9.0, no changes necessary. + * Link against libyaz to enable Z39.50 support (Closes: #550547). + + -- Michael Hanke Wed, 21 Jul 2010 12:02:48 -0400 + +kbibtex (0.2.3-1) unstable; urgency=low + + * New upstream version. New Google Scholar search engine. + * Bumped Standards-Version to 3.8.3.0 No changes necessary. + + -- Michael Hanke Sun, 23 Aug 2009 19:18:34 -0400 + +kbibtex (0.2.2-1) unstable; urgency=low + + * New upstream version (Closes: #487301, #507837, #518959, #520392). + * Bumped Standards-Version to 3.8.1. No changes necessary. + * Added 'DM-Upload-Allowed: yes'. + * Added missing '${misc:Depends}'. + * Support for per-file encoding settings (Closes: #514356) + * Upgrade debhelper compatibility to version 5. + * Update debian/copyright for 2009 release. + + -- Michael Hanke Mon, 15 Jun 2009 12:41:19 +0200 + +kbibtex (0.2.1-1) unstable; urgency=low + + * New Upstream Version. + * Bumped Standards-version to 3.7.3 (no changes necessary). + + -- Michael Hanke Mon, 17 Mar 2008 21:58:16 +0100 + +kbibtex (0.2-2) unstable; urgency=low + + * Link binary with --as-needed to dramatically reduce the number of package + dependencies. + + -- Michael Hanke Tue, 27 Nov 2007 09:48:11 +0100 + +kbibtex (0.2-1) unstable; urgency=low + + * New Upstream Version + * Moved homepage link to new Homepage filed in debian/control. + * Added VCS information to debian/control. + * KBibTeX now notices when a file was modified outside and asks whether + it should reload that file (Closes: #427983). + + -- Michael Hanke Sun, 28 Oct 2007 10:21:01 +0100 + +kbibtex (0.1.5.55-1) unstable; urgency=low + + * New upstream release. Merged patches with upstream. + * Packaging is now maintained in a GIT repository. Removing obsolete dpatch + build-dependency. + * Merge functionality was added (Closes: #434746). + * Support for exporting to Reference Manager RIS format was added. + * Updated menu file for the new menu policy. + + -- Michael Hanke Fri, 21 Sep 2007 14:16:18 +0200 + +kbibtex (0.1.5-5) unstable; urgency=low + + * Added latex2rtf as suggested package, because it is required for export + into the RTF format. + * Improved package description. Thanks to Yaroslav Halchenko for pointing + to this issue. + * Added patch to fix broken XSLT export. + + -- Michael Hanke Sat, 17 Mar 2007 08:35:37 +0100 + +kbibtex (0.1.5-4) unstable; urgency=low + + * Modified package dependencies to be compatible with texlive. + * Switch from tetex-bin suggestion to tetex-extra to have url.sty available + for exporting via latex. + * Added recommendation of texlive-bibtex-extra for additional citation + styles. + * Added patches to fix empty search results when doing multiple pubmed + queries and a bug when storing search URLs. Thanks Thomas Fischer. + + -- Michael Hanke Fri, 2 Mar 2007 20:11:34 +0100 + +kbibtex (0.1.5-3) unstable; urgency=low + + * Included upstream patch that fixes the display of accented characters + (Closes: #400065). + + -- Michael Hanke Sat, 25 Nov 2006 19:11:01 +0100 + +kbibtex (0.1.5-2) unstable; urgency=low + + * Fix FTBFS due to an invalid pure specifier. Thanks to Matthias Klose and + Martin Michlmayr. (Closes: #395378, #394143) + + -- Michael Hanke Thu, 26 Oct 2006 21:50:18 +0200 + +kbibtex (0.1.5-1) unstable; urgency=low + + * New upstream release. + + -- Michael Hanke Sat, 7 Oct 2006 08:37:00 +0200 + +kbibtex (0.1.4.85-1) unstable; urgency=low + + * New upstream release-candidate. + + -- Michael Hanke Fri, 6 Oct 2006 07:09:06 +0200 + +kbibtex (0.1.4.81-1) unstable; urgency=low + + * New upstream release-candiate. + + -- Michael Hanke Thu, 5 Oct 2006 10:15:59 +0200 + +kbibtex (0.1.4.80-1) unstable; urgency=low + + * New upstream release-candidate. + + -- Michael Hanke Wed, 4 Oct 2006 09:36:33 +0200 + +kbibtex (0.1.4-2) unstable; urgency=low + + * Bumped Standards-Version to 3.7.2 (no changes necessary). + * Added missing debian/compat file to note debhelper v4 compatibility. + + -- Michael Hanke Wed, 19 Jul 2006 12:10:55 +0200 + +kbibtex (0.1.4-1) unstable; urgency=low + + * New upstream release. + + -- Michael Hanke Wed, 26 Apr 2006 15:59:31 +0200 + +kbibtex (0.1.3.95-1) unstable; urgency=low + + * New upstream release-candidate. + + -- Michael Hanke Wed, 22 Feb 2006 21:06:12 +0100 + +kbibtex (0.1.3-2) unstable; urgency=low + + * Initial Release. (Closes: #328106) + + -- Michael Hanke Sat, 17 Dec 2005 21:57:40 +0100 + diff --git a/compat b/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +5 diff --git a/control b/control new file mode 100644 index 0000000..c5b1a1c --- /dev/null +++ b/control @@ -0,0 +1,30 @@ +Source: kbibtex +Section: kde +Priority: optional +Maintainer: Debian Science Maintainers +Uploaders: Bastien Roucariès +Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.6~), kdelibs5-dev, libpoppler-qt4-dev, libxslt1-dev, libqtwebkit-dev +Standards-Version: 3.9.2 +Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/kbibtex.git +Vcs-Git: git://git.debian.org/git/debian-science/packages/kbibtex.git +XS-DM-Upload-Allowed: yes + + +Package: kbibtex +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Suggests: texlive-latex-base | tetex-extra, bibtex2html, latex2rtf +Recommends: texlive-bibtex-extra +Description: BibTeX editor for KDE + An application to manage bibliography databases in the BibTeX format. KBibTeX + can be used as a standalone program, but can also be embedded into other KDE + applications (e.g. as bibliography editor into Kile). + . + KBibTeX can query online resources (e.g. Google scholar) via customizable + search URLs. It is also able to import complete datasets from NCBI Pubmed. + It also supports tagging references with keywords and manages references to + local files. + . + BibTeX files can be exported into HTML, XML, PDF, PS and RTF format using a + number of citation styles. diff --git a/copyright b/copyright new file mode 100644 index 0000000..6892fe0 --- /dev/null +++ b/copyright @@ -0,0 +1,36 @@ +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: kbibtex +Upstream-Contact: Thomas Fischer +Source: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/ + + +Files: * +Copyright: 2004-2011, Thomas Fischer +License: GPL-2+ + +Files: debian/* +Copyright: 2005-2011, Michael Hanke +License: GPL-2+ + +License: GPL-2+ + 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 package; 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 GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + diff --git a/dirs b/dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/docs b/docs new file mode 100644 index 0000000..e69de29 diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..97368df --- /dev/null +++ b/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +# the default branch for upstream sources: +upstream-branch = upstream +# the default branch for the debian patch: +debian-branch = master diff --git a/manpages b/manpages new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/manpages @@ -0,0 +1 @@ + diff --git a/menu b/menu new file mode 100644 index 0000000..1b780e3 --- /dev/null +++ b/menu @@ -0,0 +1,2 @@ +?package(kbibtex):needs="X11" section="Applications/Editors"\ + title="KBiBTeX" command="/usr/bin/kbibtex" diff --git a/patches/0005-Fix-data-loss-with-localfile-field.patch b/patches/0005-Fix-data-loss-with-localfile-field.patch new file mode 100644 index 0000000..4dff313 --- /dev/null +++ b/patches/0005-Fix-data-loss-with-localfile-field.patch @@ -0,0 +1,51 @@ +From e7b30a8ccdd0a166aa7e56bf033c4110307d869e Mon Sep 17 00:00:00 2001 +From: Thomas Fischer +Date: Mon, 5 Nov 2012 11:50:09 +0100 +Subject: [PATCH] Fix data loss with localfile field + +Bibtex file with localfile field are destroyed by current kbibtex. +If you create an article with your favorite editor: + +@article{test, +author = "test", +title = "test", +journal = "test", +year = 2012, +localfile = "/tmp/test.pdf", +} + +during loading the file kbibtex convert local file to http://test.pdf + +The following patch avoid this problem. + +bug-debian: http://bugs.debian.org/644024 +Forwarded: http://gna.org/bugs/?20275 +applied-upstream: 4.1 +--- + src/libkbibtexio/fileimporterbibtex.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/libkbibtexio/fileimporterbibtex.cpp b/src/libkbibtexio/fileimporterbibtex.cpp +index 570a186..8c83d07 100644 +--- a/src/libkbibtexio/fileimporterbibtex.cpp ++++ b/src/libkbibtexio/fileimporterbibtex.cpp +@@ -534,10 +534,12 @@ FileImporterBibTeX::Token FileImporterBibTeX::readValue(Value& value, const QStr + if (isStringKey) + value.append(new MacroKey(text)); + else { +- QList urls; +- FileInfo::urlsInText(text, false, QString::null, urls); +- for (QList::ConstIterator it = urls.constBegin(); it != urls.constEnd(); ++it) +- value.append(new VerbatimText((*it).pathOrUrl())); ++ /// Assumption: in fields like Url or LocalFile, file names are separated by ; or , ++ static const QRegExp semicolonSpace = QRegExp("[;]\\s*"); ++ QStringList fileList = text.split(semicolonSpace, QString::SkipEmptyParts); ++ foreach(const QString &filename, fileList) { ++ value.append(new VerbatimText(filename)); ++ } + } + } else if (iKey == Entry::ftMonth) { + if (isStringKey) { +-- +1.7.10.4 + diff --git a/patches/0006-Fix-data-loss-with-doi-fiel.patch b/patches/0006-Fix-data-loss-with-doi-fiel.patch new file mode 100644 index 0000000..207616d --- /dev/null +++ b/patches/0006-Fix-data-loss-with-doi-fiel.patch @@ -0,0 +1,45 @@ +From 8ba44e811ecea84ed385bd355ad954a6f4515ae0 Mon Sep 17 00:00:00 2001 +From: Thomas Fischer +Date: Mon, 6 Feb 2012 21:57:41 +0000 +Subject: Fix data loss with doi field + +This simple extract of a bibtex file is corrupted by bibtex +@article{JPAMG06MU, +author = "D. V. Makarov and M. Yu. Uleysky", +doi = "10.1088/0305-4470/39/3/003", +issn = "0305-4470", +issue = "3", +journal = "Journal of Physics A: Mathematical and General", +pages = "489–497", +title = "Specific Poincaré map for a randomly-perturbed nonlinear oscillator", +volume = "39", +year = "2006" +} + +If you open this file with KBibTex, doi is always cutted +to 10.1088/0305-4470 and external link, of course, don't work. +Also, KBibTex cutting this doi then saving file. + +This is a data loss from original bibtex file. + + +bug-debian: http://bugs.debian.org/694782 +Forwarded: http://gna.org/bugs/?19394 +applied-upstream: 4.1 + +git-svn-id: http://svn.gna.org/svn/kbibtex/trunk@1120 a95f91f9-4086-4c1d-b66f-92a7d89649f5 +--- + src/kbibtexnamespace.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/kbibtexnamespace.h ++++ b/src/kbibtexnamespace.h +@@ -65,7 +65,7 @@ + static const QRegExp fileListSeparatorRegExp("[ \\t]*[;\\n][ \\t]*"); + static const QRegExp fileRegExp("(\\bfile:)?[^{}\\t]+\\.\\w{2,4}\\b", Qt::CaseInsensitive); + static const QRegExp urlRegExp("\\b(http|s?ftp|webdav|file)s?://[^ {}\"]+\\b", Qt::CaseInsensitive); +-static const QRegExp doiRegExp("\\b10\\.\\d{4}/[-a-z0-9.()_:\\\\]+", Qt::CaseInsensitive); ++static const QRegExp doiRegExp("\\b10\\.\\d{4}/[/-a-z0-9.()_:\\\\]+", Qt::CaseInsensitive); + static const QString doiUrlPrefix = QLatin1String("http://dx.doi.org/"); + static const QRegExp domainNameRegExp("[a-z0-9.-]+\\.((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|h[kmnrtu]|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|me|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])", Qt::CaseInsensitive); + diff --git a/patches/compiler_fixes b/patches/compiler_fixes new file mode 100644 index 0000000..5e5afe3 --- /dev/null +++ b/patches/compiler_fixes @@ -0,0 +1,11 @@ +--- a/src/gui/preferences/settingsabstractwidget.h ++++ b/src/gui/preferences/settingsabstractwidget.h +@@ -24,6 +24,8 @@ + #include + + #include ++#include ++#include + + class KComboBox; + diff --git a/patches/ksharedconfig b/patches/ksharedconfig new file mode 100644 index 0000000..ce471ef --- /dev/null +++ b/patches/ksharedconfig @@ -0,0 +1,15 @@ +From: Sebastian Ramacher +Subject: FTBFS: bibtexfileview.h:58:5: error: 'KSharedConfigPtr' does not name a type + +Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664924 + +--- kbibtex-0.4.orig/src/gui/bibtex/bibtexfileview.h ++++ kbibtex-0.4/src/gui/bibtex/bibtexfileview.h +@@ -23,6 +23,7 @@ + #include + + #include ++#include + + class QSignalMapper; + diff --git a/patches/no_wcast-align b/patches/no_wcast-align new file mode 100644 index 0000000..a54acc8 --- /dev/null +++ b/patches/no_wcast-align @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0342839..526299a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ set(MANDIR "share/man" CACHE STRING "Where to install manpages") + + find_package( Qt4 REQUIRED ) + find_package( KDE4 REQUIRED ) ++string(REPLACE "-Wcast-align" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + + # FIXME may have to be cleaned up a little bit + # Contributed by Jeremy Cribb diff --git a/patches/remove_desktop_interpreter b/patches/remove_desktop_interpreter new file mode 100644 index 0000000..1edcd04 --- /dev/null +++ b/patches/remove_desktop_interpreter @@ -0,0 +1,12 @@ +From: Michael Hanke +Subject: Remove unnecessary interpreter line from desktop file. + +Without being executable it has no effect, and being executable is not necessary +for a desktop file. +--- a/src/program/kbibtex.desktop ++++ b/src/program/kbibtex.desktop +@@ -1,4 +1,3 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] + Encoding=UTF-8 + Name=KBibTeX diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..ed1d5c8 --- /dev/null +++ b/patches/series @@ -0,0 +1,6 @@ +ksharedconfig +compiler_fixes +remove_desktop_interpreter +no_wcast-align +0005-Fix-data-loss-with-localfile-field.patch +0006-Fix-data-loss-with-doi-fiel.patch diff --git a/rules b/rules new file mode 100755 index 0000000..6240aef --- /dev/null +++ b/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +# one ring to rule them all ... +%: + dh $@ + +override_dh_auto_configure:: + dh_auto_configure -- \ + -DPLUGIN_INSTALL_DIR:PATH=/usr/lib/kde4 \ + -DLIB_INSTALL_DIR:PATH=/usr/lib/kbibtex + +override_dh_install: + dh_install diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..b48a0f8 --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=3 +opts="passive,uversionmangle=s/-test/\~test/;s/-beta/\~beta/" \ +http://download.gna.org/kbibtex/0.4/kbibtex-(.*)\.tar\.bz2 +