rev 3838 - in trunk/packages/qt4-x11/debian: . patches

[Brian Nelson]

Author: pyro
Date: 2006-05-30 04:02:18 +0000 (Tue, 30 May 2006)
New Revision: 3838

Added:
   trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/rules
Log:
  * New upstream release
  * patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to properly
    support hppa

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-05-29 10:20:20 UTC (rev 3837)
+++ trunk/packages/qt4-x11/debian/changelog	2006-05-30 04:02:18 UTC (rev 3838)
@@ -1,3 +1,12 @@
+qt4-x11 (4.1.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+  * patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to properly
+    support hppa
+
+ -- Brian Nelson <pyro at debian.org>  Mon, 29 May 2006 21:02:03 -0700
+
 qt4-x11 (4.1.2-2) unstable; urgency=low
 
   * debian/libqt4-debug-dev.install, debian/libqt4-dev.install: added

Added: trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch	2006-05-29 10:20:20 UTC (rev 3837)
+++ trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch	2006-05-30 04:02:18 UTC (rev 3838)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_hppa_ldcw.dpatch by  <lamont at bld-4.mmjgroup.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s
+--- qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s	2006-02-03 01:50:30.000000000 +0000
++++ qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s	2006-02-03 02:00:36.000000000 +0000
+@@ -1,17 +1,7 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
+-	.IMPORT $global$,DATA
+-	.IMPORT $$dyncall,MILLICODE
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
+-
++	.text
+ 	.align 4
+ 	.EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
+-q_ldcw
++	.label q_ldcw
+ 	.PROC
+ 	.CALLINFO FRAME=0,CALLS,SAVE_RP
+ 	.ENTRY

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2006-05-29 10:20:20 UTC (rev 3837)
+++ trunk/packages/qt4-x11/debian/rules	2006-05-30 04:02:18 UTC (rev 3838)
@@ -14,7 +14,7 @@
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_INSTALL_CHANGELOGS_ALL := changes-4.1.2
+DEB_INSTALL_CHANGELOGS_ALL := changes-4.1.3
 
 
 common-configure-arch::