diff options
author | Julien Cristau <jcristau@debian.org> | 2012-05-28 12:06:10 +0200 |
---|---|---|
committer | Julien Cristau <jcristau@debian.org> | 2012-05-28 12:06:38 +0200 |
commit | c1adae40bf1a7309fe4048c5255b8fd66fb3f2d9 (patch) | |
tree | 3ebf138249e24eaa561bb2dd5c8d9f64cffc1deb | |
parent | a7a7548fe64147bf4bc612169d73ea7496484437 (diff) | |
download | xutils-dev-c1adae40bf1a7309fe4048c5255b8fd66fb3f2d9.tar.gz |
Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man for manpages
Closes: #638016.
Thanks, Svante Signell.
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/patches/07_gnu_manpath.diff | 16 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ebee21b..a20de19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xutils-dev (1:7.7~2) UNRELEASED; urgency=low + + * xorg-cf-files: Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man + for manpages (closes: #638016). Thanks, Svante Signell. + + -- Julien Cristau <jcristau@debian.org> Mon, 28 May 2012 12:05:05 +0200 + xutils-dev (1:7.7~1) unstable; urgency=low [ Robert Hooker ] diff --git a/debian/patches/07_gnu_manpath.diff b/debian/patches/07_gnu_manpath.diff new file mode 100644 index 0000000..dfe56da --- /dev/null +++ b/debian/patches/07_gnu_manpath.diff @@ -0,0 +1,16 @@ +--- xutils-dev-7.6+5/xorg-cf-files/gnu.cf 2011-08-16 16:06:57.000000000 +0200 ++++ xutils-dev-7.6+5/xorg-cf-files/gnu.cf.new 2011-08-16 16:09:58.000000000 +0200 +@@ -29,6 +29,13 @@ + # define GnuBinUtilsMajorVersion DefaultGnuBinUtilsMajorVersion + #endif + ++#ifndef ProjectRoot ++# define ProjectRoot /usr ++#endif ++#ifndef ManDirectoryRoot ++# define ManDirectoryRoot /usr/share/man ++#endif ++ + XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + XCOMM libc: (GnuCLibMajorVersion./**/GnuCLibMinorVersion./**/GnuCLibTeenyVersion) + XCOMM binutils: (GnuBinUtilsMajorVersion) diff --git a/debian/patches/series b/debian/patches/series index 86f6aba..0be66ef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 04_xutils-dev-debian.diff 05_xaw_without_xp.diff 06_font_path.diff +07_gnu_manpath.diff |