[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-2-5-gf4be3fd

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8ce21d8b86a13cb6942c24dd51775a5936fd1f7f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Mar 5 10:32:59 2015 +0300

    Update debian/README.source.
    
    - Gitorious is shutting down, use code.qt.io.
    - Update from qt4-x11 to qtbase and use a newer example version number.
    - There is no master branch in qtbase, use dev instead.
---
 debian/README.source | 10 +++++-----
 debian/changelog     |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 5101a0a..86e1810 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -211,7 +211,7 @@ Integrating original source into local repository
        $ git clean -xdff
 
        # Extract upstream source code into packaging branch working tree
-       $ tar zxvf ../qt4-x11_4.5.2.orig.tar.gz --strip=1
+       $ tar zxvf ../qtbase-opensource-src_5.4.2.orig.tar.gz --strip=1
 
        # Do packaging, committing, finally push...
 
@@ -237,19 +237,19 @@ Integrating original source into local repository
           $ git rm -r '*'
 
           # Extract tarball into the repository
-          $ tar zxvf ../qt4-x11_4.5.2.orig.tar.gz --strip=1
+          $ tar zxvf ../qtbase-opensource-src_5.4.2.orig.tar.gz --strip=1
 
           # Add all files to the index and commit the result
           $ git add -A
-          $ git commit -m "Import upstream 4.5.2 release."
+          $ git commit -m "Import upstream 5.4.2 release."
 
      b) Original source can be fetched from the remote upstream repository.
         For example, let's define a new remote 'qt' for original Qt sources.
 
-          $ git remote add qt git://gitorious.org/qt/qt.git
+          $ git remote add qt git://code.qt.io/qt/qtbase.git
           $ git remote update
           # Wait ...
-          $ git branch upstream qt/master # optional
+          $ git branch upstream qt/dev # optional
 
      Finally, read upstream tree to the packaging branch working tree, do:
 
diff --git a/debian/changelog b/debian/changelog
index 993e1a7..c86bd29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update debian/README.source for new upstream code location
+    and branching schemes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Mar 2015 10:26:29 +0300
 

-- 
qtbase packaging