[kbibtex] 02/19: New upstream version
Bastien ROUCARIES
broucaries-guest at moszumanska.debian.org
Sun Jan 3 21:33:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch debian/0.6+git7fdc0cd97c093f-1
in repository kbibtex.
commit e5de63285dae5bd6c6697db328147a2b44cbc431
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Mon Dec 28 12:00:27 2015 +0100
New upstream version
---
debian/changelog | 6 +++
debian/dirs | 1 -
debian/menu | 2 -
.../0005-Fix-data-loss-with-localfile-field.patch | 51 ----------------------
debian/patches/compiler_fixes | 11 -----
debian/patches/ksharedconfig | 15 -------
debian/patches/no_wcast-align | 12 -----
debian/patches/remove_desktop_interpreter | 12 -----
debian/patches/series | 6 +--
debian/rules | 8 ----
debian/watch | 4 +-
11 files changed, 9 insertions(+), 119 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b06ba0e..3b30da7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kbibtex (0.6+git7fdc0cd97c093f-1) experimental; urgency=medium
+
+ * New upstream release from git (qt5 port)
+
+ --
+
kbibtex (0.4-3) unstable; urgency=low
* Adopt kbibtex (Closes: #654750)
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 1b780e3..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(kbibtex):needs="X11" section="Applications/Editors"\
- title="KBiBTeX" command="/usr/bin/kbibtex"
diff --git a/debian/patches/0005-Fix-data-loss-with-localfile-field.patch b/debian/patches/0005-Fix-data-loss-with-localfile-field.patch
deleted file mode 100644
index 4dff313..0000000
--- a/debian/patches/0005-Fix-data-loss-with-localfile-field.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e7b30a8ccdd0a166aa7e56bf033c4110307d869e Mon Sep 17 00:00:00 2001
-From: Thomas Fischer <thomas.fischer at t-fischer.net>
-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:
-
- at 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<KUrl> urls;
-- FileInfo::urlsInText(text, false, QString::null, urls);
-- for (QList<KUrl>::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/debian/patches/compiler_fixes b/debian/patches/compiler_fixes
deleted file mode 100644
index 5e5afe3..0000000
--- a/debian/patches/compiler_fixes
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/preferences/settingsabstractwidget.h
-+++ b/src/gui/preferences/settingsabstractwidget.h
-@@ -24,6 +24,8 @@
- #include <kbibtexgui_export.h>
-
- #include <QWidget>
-+#include <QModelIndex>
-+#include <QAbstractItemModel>
-
- class KComboBox;
-
diff --git a/debian/patches/ksharedconfig b/debian/patches/ksharedconfig
deleted file mode 100644
index ce471ef..0000000
--- a/debian/patches/ksharedconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Sebastian Ramacher <s.ramacher at gmx.at>
-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 <QTreeView>
-
- #include <kbibtexgui_export.h>
-+#include <ksharedconfig.h>
-
- class QSignalMapper;
-
diff --git a/debian/patches/no_wcast-align b/debian/patches/no_wcast-align
deleted file mode 100644
index a54acc8..0000000
--- a/debian/patches/no_wcast-align
+++ /dev/null
@@ -1,12 +0,0 @@
-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 <cribb.jeremy at gmail.com>
diff --git a/debian/patches/remove_desktop_interpreter b/debian/patches/remove_desktop_interpreter
deleted file mode 100644
index 1edcd04..0000000
--- a/debian/patches/remove_desktop_interpreter
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Michael Hanke <mih at debian.org>
-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/debian/patches/series b/debian/patches/series
index 9e37c56..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-ksharedconfig
-compiler_fixes
-remove_desktop_interpreter
-no_wcast-align
-0005-Fix-data-loss-with-localfile-field.patch
\ No newline at end of file
+
diff --git a/debian/rules b/debian/rules
index 6240aef..b869b11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,3 @@
# 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/debian/watch b/debian/watch
index b48a0f8..2eb004a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-opts="passive,uversionmangle=s/-test/\~test/;s/-beta/\~beta/" \
-http://download.gna.org/kbibtex/0.4/kbibtex-(.*)\.tar\.bz2
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+http://home.gna.org/kbibtex/download.html .*/kbibtex-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:xz|gz|bz2))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kbibtex.git
More information about the debian-science-commits
mailing list