[SCM] QImageBlitz packaging branch, master, updated. debian/0.0.4-3-6-gdfe2756

[Modestas Vainius]

The following commit has been merged in the master branch:
commit dfe27561c52747bfb377eff7213690cbe4f4bff5
Merge: 69aa3512a25a12301268a90c4b89e0572f05f873 21a54d77f96bee134d4057592c7fb624808b7977
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 03:36:13 2010 +0300

    Merge changes from real 1:0.0.4-4 upload.
    
    Conflicts:
    	debian/changelog

 debian/changelog                 |   10 ++++++++--
 debian/patches/11_.gnu.note.diff |   12 ++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 1321c9c,41a443d..9c902dc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,22 @@@
- qimageblitz (1:0.0.4-4) UNRELEASED; urgency=low
++qimageblitz (1:0.0.4-5) UNRELEASED; urgency=low
 +
 +  * Bump debian/compat and debhelper build dependency to v7 (to get more
 +    sophisticated debian/tmp handling).
 +  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
 +    - build depend on pkg-kde-tools 0.4;
 +    - remove debian/cdbs directory;
 +    - replace debian/cdbs/kde.mk with
 +      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
-   * Remove THIS_SHOULD_GO_TO_UNSTABLE from debian/rules.
 +
 + -- Modestas Vainius <modestas at vainius.eu>  Mon, 16 Feb 2009 02:10:50 +0200
 +
+ qimageblitz (1:0.0.4-4) unstable; urgency=low
+ 
+   * Upload to unstable.
+   * Move .gnu.note section for non-i386 architectures. (Closes: #479575)
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2008 14:51:27 +0200
+ 
  qimageblitz (1:0.0.4-3) experimental; urgency=low
  
    +++ Changes by Fathi Boudra:

-- 
QImageBlitz packaging