[SCM] qtcreator packaging branch, master, updated. 782e7526a37098ec9661d4140ee92d9d17e1728c
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Wed May 22 21:36:16 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=782e752
The following commit has been merged in the master branch:
commit 782e7526a37098ec9661d4140ee92d9d17e1728c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed May 22 18:35:55 2013 -0300
Drop patches applied upstream.
---
debian/changelog | 2 +
.../patches/Fix_revno_detection_in_bzr_log.patch | 102 --------------------
.../Use_bzr_branch_instead_of_bzr_clone.patch | 45 ---------
debian/patches/series | 2 -
4 files changed, 2 insertions(+), 149 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7bc8cde..16d6d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
the bundled one.
- Add botan_system_lib.diff slightly adapted from openSUSE.
- Build-depend on libbotan1.10-dev and pkg-config.
+ - Drop Use_bzr_branch_instead_of_bzr_clone.patch and
+ Fix_revno_detection_in_bzr_log.patch: merged upstream.
* Remove posix_rt_nonlinux.diff. It applies against 3rd party botan, but we
are now using the system botan.
* Start using Qt5 to compile. Adapt B-Ds:
diff --git a/debian/patches/Fix_revno_detection_in_bzr_log.patch b/debian/patches/Fix_revno_detection_in_bzr_log.patch
deleted file mode 100644
index adb964c..0000000
--- a/debian/patches/Fix_revno_detection_in_bzr_log.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-commit acd49da4925103dc83bd2d8053d915d81cf26492
-Author: Aurélien Gâteau <aurelien.gateau at canonical.com>
-Date: Thu Jan 26 14:18:59 2012 +0100
-
- Fix revno detection in bzr log
-
- Avoid false-positives when looking for changes under cursor in log view.
-
- Change-Id: Ic0f9c105747ee2c1792b372f9cb3757017633861
- Reviewed-by: Hugues Delorme <delorme.hugues at fougsys.fr>
-
----
- src/plugins/bazaar/annotationhighlighter.cpp | 2 +-
- src/plugins/bazaar/bazaareditor.cpp | 27 +++++++++++++++++++++++----
- src/plugins/bazaar/bazaareditor.h | 1 +
- src/plugins/bazaar/constants.h | 9 +++++++--
- 4 files changed, 32 insertions(+), 7 deletions(-)
-
---- a/src/plugins/bazaar/annotationhighlighter.cpp
-+++ b/src/plugins/bazaar/annotationhighlighter.cpp
-@@ -40,7 +40,7 @@ BazaarAnnotationHighlighter::BazaarAnnot
- const QColor &bg,
- QTextDocument *document)
- : VcsBase::BaseAnnotationHighlighter(changeNumbers, bg, document),
-- m_changeset(QLatin1String(Constants::CHANGESET_ID))
-+ m_changeset(QLatin1String(Constants::ANNOTATE_CHANGESET_ID))
- {
- }
-
---- a/src/plugins/bazaar/bazaareditor.cpp
-+++ b/src/plugins/bazaar/bazaareditor.cpp
-@@ -55,6 +55,7 @@ using namespace Bazaar;
-
- BazaarEditor::BazaarEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent)
- : VcsBase::VcsBaseEditorWidget(type, parent),
-+ m_changesetId(QLatin1String(Constants::CHANGESET_ID)),
- m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)),
- m_diffFileId(QLatin1String("^=== [a-z]+ [a-z]+ '(.*)'\s*"))
- {
-@@ -86,12 +87,30 @@ QSet<QString> BazaarEditor::annotationCh
-
- QString BazaarEditor::changeUnderCursor(const QTextCursor &cursorIn) const
- {
-+ // The test is done in two steps: first we check if the line contains a
-+ // changesetId. Then we check if the cursor is over the changesetId itself
-+ // and not over "revno" or another part of the line.
-+ // The two steps are necessary because matching only for the changesetId
-+ // leads to many false-positives (a regex like "[0-9]+" matches a lot of text).
-+ const int cursorCol = cursorIn.columnNumber();
- QTextCursor cursor = cursorIn;
-- cursor.select(QTextCursor::WordUnderCursor);
-+ cursor.select(QTextCursor::LineUnderCursor);
- if (cursor.hasSelection()) {
-- const QString change = cursor.selectedText();
-- if (m_exactChangesetId.exactMatch(change))
-- return change;
-+ const QString line = cursor.selectedText();
-+ const int start = m_changesetId.indexIn(line);
-+ if (start > -1) {
-+ const QString match = m_changesetId.cap(0);
-+ const int stop = start + match.length();
-+ if (start <= cursorCol && cursorCol <= stop) {
-+ cursor = cursorIn;
-+ cursor.select(QTextCursor::WordUnderCursor);
-+ if (cursor.hasSelection()) {
-+ const QString change = cursor.selectedText();
-+ if (m_exactChangesetId.exactMatch(change))
-+ return change;
-+ }
-+ }
-+ }
- }
- return QString();
- }
---- a/src/plugins/bazaar/bazaareditor.h
-+++ b/src/plugins/bazaar/bazaareditor.h
-@@ -54,6 +54,7 @@ private:
- virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const;
- virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
-
-+ const QRegExp m_changesetId;
- const QRegExp m_exactChangesetId;
- const QRegExp m_diffFileId;
- };
---- a/src/plugins/bazaar/constants.h
-+++ b/src/plugins/bazaar/constants.h
-@@ -41,8 +41,13 @@ const char BAZAARREPO[] = ".bzr";
- const char BAZAARDEFAULT[] = "bzr";
-
- // Changeset identifiers
--const char CHANGESET_ID[] = "([0-9]+)"; // match and capture
--const char CHANGESET_ID_EXACT[] = "[0-9]+"; // match
-+const char CHANGESET_ID[] = "^("
-+ "revno: [.0-9]+" // detailed
-+ "| +[.0-9]+" // short
-+ "|[.0-9]+: " // line
-+ ")";
-+const char CHANGESET_ID_EXACT[] = "([.0-9]+)";
-+const char ANNOTATE_CHANGESET_ID[] = "([.0-9]+)";
-
- // Base editor parameters
- const char COMMANDLOG_ID[] = "Bazaar Command Log Editor";
diff --git a/debian/patches/Use_bzr_branch_instead_of_bzr_clone.patch b/debian/patches/Use_bzr_branch_instead_of_bzr_clone.patch
deleted file mode 100644
index 989582f..0000000
--- a/debian/patches/Use_bzr_branch_instead_of_bzr_clone.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 4790641934fea76a8930c4157ceb54a6536cdd57
-Author: Aurélien Gâteau <aurelien.gateau at canonical.com>
-Date: Wed Feb 1 11:24:54 2012 +0100
-
- Use "bzr branch" instead of "bzr clone"
-
- "bzr clone" is deprecated. "bzr branch" does the same thing.
-
- Change-Id: Iafed249ff213fbd2734a900cb410fa7f23f3e84f
- Reviewed-by: Hugues Delorme <delorme.hugues at fougsys.fr>
-
----
- src/plugins/bazaar/bazaarclient.cpp | 10 ++++++++++
- src/plugins/bazaar/bazaarclient.h | 1 +
- 2 files changed, 11 insertions(+)
-
---- a/src/plugins/bazaar/bazaarclient.cpp
-+++ b/src/plugins/bazaar/bazaarclient.cpp
-@@ -140,6 +140,16 @@ QString BazaarClient::vcsEditorKind(VcsC
- }
- }
-
-+QString BazaarClient::vcsCommandString(VcsCommand cmd) const
-+{
-+ switch (cmd) {
-+ case CloneCommand:
-+ return QLatin1String("branch");
-+ default:
-+ return VcsBaseClient::vcsCommandString(cmd);
-+ }
-+}
-+
- QStringList BazaarClient::revisionSpec(const QString &revision) const
- {
- QStringList args;
---- a/src/plugins/bazaar/bazaarclient.h
-+++ b/src/plugins/bazaar/bazaarclient.h
-@@ -64,6 +64,7 @@ public:
-
- protected:
- QString vcsEditorKind(VcsCommand cmd) const;
-+ QString vcsCommandString(VcsCommand cmd) const;
- QStringList revisionSpec(const QString &revision) const;
- VcsBase::VcsBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
- const QStringList &files,
diff --git a/debian/patches/series b/debian/patches/series
index 5e37740..e2e29be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
02_use_x-terminal-emulator.diff
03_fix_DOCPATH.diff
-Use_bzr_branch_instead_of_bzr_clone.patch
-Fix_revno_detection_in_bzr_log.patch
rpath_nonlinux.diff
posix_rt_nonlinux.diff
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list