summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/00list26
-rwxr-xr-xdebian/patches/01_qmake_for_debian.dpatch (renamed from debian/patches/10_qmake_for_debian.dpatch)0
-rwxr-xr-xdebian/patches/02_launch_assistant-qt4.dpatch (renamed from debian/patches/11_launch_assistant-qt4.dpatch)0
-rwxr-xr-xdebian/patches/03_launch_moc-qt4.dpatch (renamed from debian/patches/22_launch_moc-qt4.dpatch)0
-rw-r--r--debian/patches/20_mips_atomic_ops.dpatch (renamed from debian/patches/12_mips_atomic_ops.dpatch)0
-rwxr-xr-xdebian/patches/30_arm_ftbfs_fixes.dpatch (renamed from debian/patches/13_arm_ftbfs_fixes.dpatch)0
-rw-r--r--debian/patches/31_arm_eabi_fix.dpatch (renamed from debian/patches/90_arm_eabi_fix.dpatch)0
-rw-r--r--debian/patches/40_alpha_ice.dpatch (renamed from debian/patches/17_alpha_ice.dpatch)0
-rw-r--r--debian/patches/41_alpha_disable_opengl_visibility.dpatch (renamed from debian/patches/18_disable_opengl_visibility.dpatch)0
-rwxr-xr-xdebian/patches/50_kfreebsd_build_fix.dpatch (renamed from debian/patches/14_kfreebsd_build_fix.dpatch)0
-rwxr-xr-xdebian/patches/60_m68k_inotify_fix.dpatch (renamed from debian/patches/19_m68k_inotify_fix.dpatch)0
-rw-r--r--debian/patches/70_hppa_ldcw_fix.dpatch (renamed from debian/patches/16_hppa_ldcw_fix.dpatch)0
-rwxr-xr-xdebian/patches/71_hppa_inotify_fix.dpatch (renamed from debian/patches/20_hppa_inotify_fix.dpatch)0
-rw-r--r--debian/patches/80_hurd_detection.dpatch (renamed from debian/patches/21_hurd_detection.dpatch)0
15 files changed, 17 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index c6e2d71..5ba0868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,10 @@ qt4-x11 (4.2.2-1) UNRELEASED; urgency=low
* debian/qt4-designer.links: added a link /usr/share/qt4/bin/designer ->
/usr/bin/designer-qt4 (Closes: #410885)
- -- Brian Nelson <pyro@debian.org> Sat, 3 Mar 2007 13:08:30 -0500
+ * Re-arranged patches to group them by arch so that they're easier to
+ deal with
+
+ -- Brian Nelson <pyro@debian.org> Sun, 4 Mar 2007 10:26:01 -0500
qt4-x11 (4.2.1-2) unstable; urgency=low
diff --git a/debian/patches/00list b/debian/patches/00list
index 4f59234..f2bc30a 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,13 +1,13 @@
-10_qmake_for_debian
-11_launch_assistant-qt4
-12_mips_atomic_ops
-13_arm_ftbfs_fixes
-14_kfreebsd_build_fix
-16_hppa_ldcw_fix
-17_alpha_ice
-18_disable_opengl_visibility
-19_m68k_inotify_fix
-20_hppa_inotify_fix
-21_hurd_detection
-22_launch_moc-qt4
-90_arm_eabi_fix
+01_qmake_for_debian
+02_launch_assistant-qt4
+03_launch_moc-qt4
+20_mips_atomic_ops
+30_arm_ftbfs_fixes
+31_arm_eabi_fix
+40_alpha_ice
+41_alpha_disable_opengl_visibility
+50_kfreebsd_build_fix
+60_m68k_inotify_fix
+70_hppa_ldcw_fix
+71_hppa_inotify_fix
+80_hurd_detection
diff --git a/debian/patches/10_qmake_for_debian.dpatch b/debian/patches/01_qmake_for_debian.dpatch
index 980f19c..980f19c 100755
--- a/debian/patches/10_qmake_for_debian.dpatch
+++ b/debian/patches/01_qmake_for_debian.dpatch
diff --git a/debian/patches/11_launch_assistant-qt4.dpatch b/debian/patches/02_launch_assistant-qt4.dpatch
index 4f623cf..4f623cf 100755
--- a/debian/patches/11_launch_assistant-qt4.dpatch
+++ b/debian/patches/02_launch_assistant-qt4.dpatch
diff --git a/debian/patches/22_launch_moc-qt4.dpatch b/debian/patches/03_launch_moc-qt4.dpatch
index e5d7cdd..e5d7cdd 100755
--- a/debian/patches/22_launch_moc-qt4.dpatch
+++ b/debian/patches/03_launch_moc-qt4.dpatch
diff --git a/debian/patches/12_mips_atomic_ops.dpatch b/debian/patches/20_mips_atomic_ops.dpatch
index c3f9a21..c3f9a21 100644
--- a/debian/patches/12_mips_atomic_ops.dpatch
+++ b/debian/patches/20_mips_atomic_ops.dpatch
diff --git a/debian/patches/13_arm_ftbfs_fixes.dpatch b/debian/patches/30_arm_ftbfs_fixes.dpatch
index ae2f46c..ae2f46c 100755
--- a/debian/patches/13_arm_ftbfs_fixes.dpatch
+++ b/debian/patches/30_arm_ftbfs_fixes.dpatch
diff --git a/debian/patches/90_arm_eabi_fix.dpatch b/debian/patches/31_arm_eabi_fix.dpatch
index a826663..a826663 100644
--- a/debian/patches/90_arm_eabi_fix.dpatch
+++ b/debian/patches/31_arm_eabi_fix.dpatch
diff --git a/debian/patches/17_alpha_ice.dpatch b/debian/patches/40_alpha_ice.dpatch
index 8529bff..8529bff 100644
--- a/debian/patches/17_alpha_ice.dpatch
+++ b/debian/patches/40_alpha_ice.dpatch
diff --git a/debian/patches/18_disable_opengl_visibility.dpatch b/debian/patches/41_alpha_disable_opengl_visibility.dpatch
index 040e695..040e695 100644
--- a/debian/patches/18_disable_opengl_visibility.dpatch
+++ b/debian/patches/41_alpha_disable_opengl_visibility.dpatch
diff --git a/debian/patches/14_kfreebsd_build_fix.dpatch b/debian/patches/50_kfreebsd_build_fix.dpatch
index cbf6459..cbf6459 100755
--- a/debian/patches/14_kfreebsd_build_fix.dpatch
+++ b/debian/patches/50_kfreebsd_build_fix.dpatch
diff --git a/debian/patches/19_m68k_inotify_fix.dpatch b/debian/patches/60_m68k_inotify_fix.dpatch
index 9dd507d..9dd507d 100755
--- a/debian/patches/19_m68k_inotify_fix.dpatch
+++ b/debian/patches/60_m68k_inotify_fix.dpatch
diff --git a/debian/patches/16_hppa_ldcw_fix.dpatch b/debian/patches/70_hppa_ldcw_fix.dpatch
index 0405799..0405799 100644
--- a/debian/patches/16_hppa_ldcw_fix.dpatch
+++ b/debian/patches/70_hppa_ldcw_fix.dpatch
diff --git a/debian/patches/20_hppa_inotify_fix.dpatch b/debian/patches/71_hppa_inotify_fix.dpatch
index fb679e6..fb679e6 100755
--- a/debian/patches/20_hppa_inotify_fix.dpatch
+++ b/debian/patches/71_hppa_inotify_fix.dpatch
diff --git a/debian/patches/21_hurd_detection.dpatch b/debian/patches/80_hurd_detection.dpatch
index a6860f5..a6860f5 100644
--- a/debian/patches/21_hurd_detection.dpatch
+++ b/debian/patches/80_hurd_detection.dpatch