diff options
| author | Fathi Boudra <fabo@debian.org> | 2008-09-29 08:15:01 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2008-09-29 08:15:01 +0000 |
| commit | 88db61fdba87aab56cea7268998f85ae32e882c1 (patch) | |
| tree | b945cac13744e40fe3270b2807306b75f7f8df7c | |
| parent | 4f70e5cc9b022c7c746b1e60f487bf63b95f0be2 (diff) | |
| download | qt4-x11-88db61fdba87aab56cea7268998f85ae32e882c1.tar.gz | |
Remove 60_m68k_inotify_fix. Merged upstream since ages.
Drop 72_generic_arch_atomic_header_fix. Fixed upstream and not applied
anyway.
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/patches/60_m68k_inotify_fix.diff | 18 | ||||
| -rw-r--r-- | debian/patches/72_generic_arch_atomic_header_fix.diff | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 13 insertions, 34 deletions
diff --git a/debian/changelog b/debian/changelog index 2c6de2d..8b38d9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +qt4-x11 (4.4.3-1) UNRELEASED; urgency=low + + * New upstream release: + It includes updated copyright headers, as well as updated application icons + and other graphics to reflect the look and feel of the new Qt brand. + + +++ Changes by Fathi Boudra: + + * Remove Debian patches: + - 60_m68k_inotify_fix.diff (merged upstream) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 29 Sep 2008 10:02:32 +0200 + qt4-x11 (4.4.2-2) unstable; urgency=low +++ Changes by Fathi Boudra: diff --git a/debian/patches/60_m68k_inotify_fix.diff b/debian/patches/60_m68k_inotify_fix.diff deleted file mode 100644 index aac297a..0000000 --- a/debian/patches/60_m68k_inotify_fix.diff +++ /dev/null @@ -1,18 +0,0 @@ -author: Brian Nelson <pyro@debian.org> - -From Roman Zippel <zippel@linux-m68k.org>: These defines are taken from the -m68k tree, they should appear like this soon also in the upstream source. - ---- a/src/corelib/io/qfilesystemwatcher_inotify.cpp -+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp -@@ -112,6 +112,10 @@ - # define __NR_inotify_init 240 - # define __NR_inotify_add_watch 241 - # define __NR_inotify_rm_watch 242 -+#elif defined (__mc68000__) -+# define __NR_inotify_init 284 -+# define __NR_inotify_add_watch 285 -+# define __NR_inotify_rm_watch 286 - #else - # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" - #endif diff --git a/debian/patches/72_generic_arch_atomic_header_fix.diff b/debian/patches/72_generic_arch_atomic_header_fix.diff deleted file mode 100644 index b61efcf..0000000 --- a/debian/patches/72_generic_arch_atomic_header_fix.diff +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475767 - -This mostly affects hppa, but hppa is "community supported" - meaning that the Trolls doesn't care much. - ---- a/src/corelib/arch/qatomic_generic.h -+++ b/src/corelib/arch/qatomic_generic.h -@@ -223,7 +223,7 @@ - Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) - { - return reinterpret_cast<T *> -- (QBasicAtomicPointer_fetchAndStoreOrdered(&reinterpret_cast<void * volatile *>(&_q_value), -+ (QBasicAtomicPointer_fetchAndStoreOrdered(reinterpret_cast<void * volatile *>(&_q_value), - newValue)); - } - diff --git a/debian/patches/series b/debian/patches/series index 00ff59e..9008aef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,7 +34,6 @@ 40_alpha_ice.diff 41_disable_opengl_visibility.diff 50_kfreebsd_build_fix.diff -60_m68k_inotify_fix.diff 70_hppa_ldcw_fix.diff 71_hppa_unaligned_access_fix_458133.diff 80_hurd_max_path.diff |