[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-3-3-gfdeb637

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Tue Oct 14 15:05:34 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=fdeb637

The following commit has been merged in the master branch:
commit fdeb63788614a2c18b120a5d9c26c158467f896a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 14 19:05:31 2014 +0400

    Update no_gnu_hash.diff headers.
    
    That patch is now applied upstream.
---
 debian/changelog                | 2 +-
 debian/patches/no_gnu_hash.diff | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 752e016..f17ace8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qbs (1.3.1+dfsg-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
-  * Add a patch to not hardcode the linker hash style.
+  * Add upstream patch to not hardcode the linker hash style.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 21:37:12 +0400
 
diff --git a/debian/patches/no_gnu_hash.diff b/debian/patches/no_gnu_hash.diff
index 31bfac2..732ec5d 100644
--- a/debian/patches/no_gnu_hash.diff
+++ b/debian/patches/no_gnu_hash.diff
@@ -1,7 +1,5 @@
 Description: do not hardcode hash style
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Bug: https://bugreports.qt-project.org/browse/QBS-696
-Forwarded: not-needed
+Origin: upstream, https://qt.gitorious.org/qt-labs/qbs/commit/14dd7b7e99705196
 Last-Update: 2014-10-08
 
 --- a/share/qbs/modules/cpp/GenericGCC.qbs

-- 
qbs packaging



More information about the pkg-kde-commits mailing list