diff options
| author | Brian Nelson <pyro@debian.org> | 2006-05-30 04:02:18 +0000 |
|---|---|---|
| committer | Brian Nelson <pyro@debian.org> | 2006-05-30 04:02:18 +0000 |
| commit | 984009d33c213ae902a2462938ea2b10ea596a06 (patch) | |
| tree | 34f6b30d9731a945a81c2cb99d9633d14c5bd4eb | |
| parent | b9de93d22540bf2375be83d52f79e6defed01087 (diff) | |
| download | qt4-x11-984009d33c213ae902a2462938ea2b10ea596a06.tar.gz | |
* New upstream release
* patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to properly
support hppa
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/16_hppa_ldcw_fix.dpatch | 30 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 40 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e3aaba0..943dbcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@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 diff --git a/debian/patches/16_hppa_ldcw_fix.dpatch b/debian/patches/16_hppa_ldcw_fix.dpatch new file mode 100644 index 0000000..779341d --- /dev/null +++ b/debian/patches/16_hppa_ldcw_fix.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_hppa_ldcw.dpatch by <lamont@bld-4.mmjgroup.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 diff --git a/debian/rules b/debian/rules index 971cc64..fb10061 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install 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:: |