summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fabo@debian.org>2008-05-07 07:04:42 +0000
committerFathi Boudra <fabo@debian.org>2008-05-07 07:04:42 +0000
commit1614d13ecc2f8516f50f5bd264c24ba070e88378 (patch)
tree37189f04df5b24881cbcd613c51ff5584f202919
parent29faf9bae0d5d6d90f900d87f72b7e69c7f93633 (diff)
downloadqt4-x11-1614d13ecc2f8516f50f5bd264c24ba070e88378.tar.gz
* Prepare Qt4.4.0 upload. (already uploaded)
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/0223-fix-qpixmap-hasalpha.diff2
-rw-r--r--debian/patches/0224-fast-qpixmap-fill.diff2
-rwxr-xr-xdebian/rules3
4 files changed, 5 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d57e166..d6f4d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt4-x11 (4.4.0-1) UNRELEASED; urgency=low
+qt4-x11 (4.4.0-1) unstable; urgency=low
* New upstream release.
@@ -35,7 +35,7 @@ qt4-x11 (4.4.0-1) UNRELEASED; urgency=low
column (so no other columns become shrinked), the contents will be
visible.
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 03 May 2008 11:26:50 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 06 May 2008 17:37:49 +0200
qt4-x11 (4.4.0~rc1-5) unstable; urgency=high
diff --git a/debian/patches/0223-fix-qpixmap-hasalpha.diff b/debian/patches/0223-fix-qpixmap-hasalpha.diff
index 063660e..5e7a058 100644
--- a/debian/patches/0223-fix-qpixmap-hasalpha.diff
+++ b/debian/patches/0223-fix-qpixmap-hasalpha.diff
@@ -1,7 +1,7 @@
qt-bugs@ issue : N206173
Trolltech task ID : 206174
bugs.kde.org number : none
-applied: yes
+applied: no
author: Fredrik Höglund <fredrik@kde.org>
Calling data->mask() in a pixmap that has an alpha channel causes
diff --git a/debian/patches/0224-fast-qpixmap-fill.diff b/debian/patches/0224-fast-qpixmap-fill.diff
index 832b31d..6e6c5c6 100644
--- a/debian/patches/0224-fast-qpixmap-fill.diff
+++ b/debian/patches/0224-fast-qpixmap-fill.diff
@@ -1,7 +1,7 @@
qt-bugs@ issue : None
Trolltech task ID : None
bugs.kde.org number : None
-applied: yes
+applied: no
author: Fredrik Höglund <fredrik@kde.org>
Since there's no way to specify that a QPixmap should have an alpha channel
diff --git a/debian/rules b/debian/rules
index 25d1fc8..c9a8a0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,7 @@ DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
-# Qt4.4.0-beta1 does not contain changes file
-#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT