summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Nelson <pyro@debian.org>2006-10-31 13:51:48 +0000
committerBrian Nelson <pyro@debian.org>2006-10-31 13:51:48 +0000
commite33bbfa6fe6645517e5de022e28a0ac6222dad0c (patch)
tree1885ac80ada9b721d5702e3842b3886e27753836
parenta9934a2d050eda1e4cff4d73035c9bf7655925df (diff)
downloadqt4-x11-debian/4.2.1-2.tar.gz
removed a hurd patch that didn't applydebian/4.2.1-2
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/00list1
-rw-r--r--debian/patches/22_hurd_path_max.dpatch33
3 files changed, 2 insertions, 36 deletions
diff --git a/debian/changelog b/debian/changelog
index 65a0749..cd366fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt4-x11 (4.2.1-2) UNRELEASED; urgency=low
+qt4-x11 (4.2.1-2) unstable; urgency=low
* debian/patches/20_hppa_inotify_fix.dpatch: new patch that should fix
the FTBFS on hppa due to missing defines (Closes: #394953)
@@ -9,7 +9,7 @@ qt4-x11 (4.2.1-2) UNRELEASED; urgency=low
to remove link_prl from the CONFIG line, which fixes problems with
unnecessary linkage (Closes: #394836)
- -- Brian Nelson <pyro@debian.org> Mon, 30 Oct 2006 22:27:45 -0500
+ -- Brian Nelson <pyro@debian.org> Tue, 31 Oct 2006 02:42:02 -0500
qt4-x11 (4.2.1-1) unstable; urgency=high
diff --git a/debian/patches/00list b/debian/patches/00list
index 22ee1ab..77b1838 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,4 +9,3 @@
19_m68k_inotify_fix
20_hppa_inotify_fix
21_hurd_detection
-22_hurd_path_max
diff --git a/debian/patches/22_hurd_path_max.dpatch b/debian/patches/22_hurd_path_max.dpatch
deleted file mode 100644
index c39a2e4..0000000
--- a/debian/patches/22_hurd_path_max.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_hurd_detection.dpatch by Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix (workaround) POSIX incompatibility: unconditional use of PATH_MAX
-
-@DPATCH@
-diff -Nur qt4-x11-4.1.3~/src/3rdparty/dlcompat/dlfcn.h qt4-x11-4.1.3/src/3rdparty/dlcompat/dlfcn.h
---- qt4-x11-4.1.3~/src/3rdparty/dlcompat/dlfcn.h 2006-07-21 11:50:39.000000000 +0000
-+++ qt4-x11-4.1.3/src/3rdparty/dlcompat/dlfcn.h 2006-07-21 11:59:52.000000000 +0000
-@@ -99,4 +99,8 @@
- }
- #endif
-
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- #endif /* _DLFCN_H_ */
-diff -Nur qt4-x11-4.1.3~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.1.3/src/corelib/io/qfsfileengine_unix.cpp
---- qt4-x11-4.1.3~/src/corelib/io/qfsfileengine_unix.cpp 2006-07-21 11:50:38.000000000 +0000
-+++ qt4-x11-4.1.3/src/corelib/io/qfsfileengine_unix.cpp 2006-07-21 11:59:52.000000000 +0000
-@@ -40,6 +40,10 @@
- # include <private/qcore_mac_p.h>
- #endif
-
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- void QFSFileEnginePrivate::init()
- {
- }