Imported Debian patch 1:4.4.0-3
Daniel Kobras authored 16 years ago
Graham Inggs committed 10 years ago
|
0 |
dx (1:4.4.0-3) unstable; urgency=low
|
|
1 |
|
|
2 |
* Added patches:
|
|
3 |
+ [10_kernel_includes_fix]
|
|
4 |
Rather than build-depending on kernel headers, remove the
|
|
5 |
corresponding includes as they are superfluous these days, anyway.
|
|
6 |
Fixes build failures on systems where linux-libc-dev provides
|
|
7 |
linux-kernel-headers.
|
|
8 |
* debian/control: Back out build-dependency on linux-kernel-headers.
|
|
9 |
It's not a dependency regular application ought to pull in.
|
|
10 |
* debian/dx.desktop: Register dx with standard desktops. Patch thanks
|
|
11 |
to Barry deFreese. Closes: #376785
|
|
12 |
* debian/rules: Install desktop file and icon.
|
|
13 |
|
|
14 |
-- Daniel Kobras <kobras@debian.org> Tue, 12 Jun 2007 20:37:57 +0200
|
|
15 |
|
| 0 | 16 |
dx (1:4.4.0-2.1) unstable; urgency=low
|
| 1 | 17 |
|
| 2 | 18 |
* Non-maintainer upload.
|
| 1 | 1 |
Section: science
|
| 2 | 2 |
Priority: optional
|
| 3 | 3 |
Maintainer: Daniel Kobras <kobras@debian.org>
|
| 4 | |
Build-Depends: lesstif2-dev | lesstif-dev | libmotif-dev, libx11-dev | xlibs-dev, x-dev | xlibs-dev, libxt-dev | xlibs-dev, libxpm-dev | xlibs-dev, libxmu-dev | xlibs-dev, libbz2-dev, libglu1-xorg-dev (>= 6.8.2.dfsg.1-3) | libglu-dev, libmagick9-dev | libmagick6-dev | libmagick-dev, libpng12-dev, libhdf4g-dev, netcdfg-dev, libxml2-dev, libjpeg62-dev, libtiff4-dev | libtiff-dev, zlib1g-dev | libz-dev, flex, bison, m4, autotools-dev, debhelper (>= 4.0.9), ed, dpatch, linux-kernel-headers
|
|
4 |
Build-Depends: lesstif2-dev | lesstif-dev | libmotif-dev, libx11-dev | xlibs-dev, x-dev | xlibs-dev, libxt-dev | xlibs-dev, libxpm-dev | xlibs-dev, libxmu-dev | xlibs-dev, libbz2-dev, libglu1-xorg-dev (>= 6.8.2.dfsg.1-3) | libglu-dev, libmagick9-dev | libmagick6-dev | libmagick-dev, libpng12-dev, libhdf4g-dev, netcdfg-dev, libxml2-dev, libjpeg62-dev, libtiff4-dev | libtiff-dev, zlib1g-dev | libz-dev, flex, bison, m4, autotools-dev, debhelper (>= 4.0.9), ed, dpatch
|
| 5 | 5 |
Standards-Version: 3.6.2
|
| 6 | 6 |
|
| 7 | 7 |
Package: dx
|
|
0 |
[Desktop Entry]
|
|
1 |
Version=1.0
|
|
2 |
Encoding=UTF-8
|
|
3 |
Name=OpenDX Data Explorer
|
|
4 |
GenericName=Data Explorer
|
|
5 |
Comment=Visualize scientific, engineering and analytical data
|
|
6 |
Comment[en_GB]=Visualise scientific, engineering and analytical data
|
|
7 |
Type=Application
|
|
8 |
Exec=dx
|
|
9 |
Icon=dxicon
|
|
10 |
Categories=Application;Education;Science;
|
| 1 | 1 |
10_invert3_aliasing_fix
|
| 2 | 2 |
10_invoke_man
|
| 3 | 3 |
10_64bit_pointer_fixes
|
|
4 |
10_kernel_includes_fix
|
| 4 | 5 |
90_usr_local_cleanup
|
|
0 |
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
1 |
## 10_kernel_includes_fix.dpatch by Daniel Kobras <kobras@debian.org>
|
|
2 |
##
|
|
3 |
## All lines beginning with `## DP:' are a description of the patch.
|
|
4 |
## DP: Include files in linux/ are kernel headers that should never be
|
|
5 |
## DP: pulled in directly by regular applications, and indeed they're
|
|
6 |
## DP: superfluous (theses days, at least). Current distributions
|
|
7 |
## DP: tend to ship without these files installed by default, hence
|
|
8 |
## DP: removing the includes avoid build failures.
|
|
9 |
|
|
10 |
@DPATCH@
|
|
11 |
diff -urNad dx~/src/exec/libdx/memory.c dx/src/exec/libdx/memory.c
|
|
12 |
--- dx~/src/exec/libdx/memory.c 2006-01-27 11:29:54.000000000 +0100
|
|
13 |
+++ dx/src/exec/libdx/memory.c 2007-06-12 20:21:32.000000000 +0200
|
|
14 |
@@ -65,8 +65,6 @@
|
|
15 |
#endif
|
|
16 |
|
|
17 |
#if linux
|
|
18 |
-#include <linux/kernel.h>
|
|
19 |
-#include <linux/sys.h>
|
|
20 |
#include <sys/sysinfo.h>
|
|
21 |
#endif
|
|
22 |
|
| 134 | 134 |
# No clue where this symlink is coming from.
|
| 135 | 135 |
rm -f `pwd`/debian/libdx4-dev/usr/include/include
|
| 136 | 136 |
|
|
137 |
# Install icon and desktop file
|
|
138 |
install -d debian/dx/usr/share/pixmaps
|
|
139 |
install -d debian/dx/usr/share/applications
|
|
140 |
install -m644 debian/dxicon.xpm debian/dx/usr/share/pixmaps
|
|
141 |
install -m644 debian/dx.desktop debian/dx/usr/share/applications
|
|
142 |
|
| 137 | 143 |
touch install-stamp
|
| 138 | 144 |
|
| 139 | 145 |
# Build architecture-independent files here.
|