summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Nusinow <dnusinow@debian.org>2006-05-30 03:50:30 +0000
committerDavid Nusinow <dnusinow@debian.org>2006-05-30 03:50:30 +0000
commit4db5755464b96fee5c7628a509a6694593381950 (patch)
tree0ab913c725a38db25a021770e691b4e2a6772060
parent7b5ba13991033f75894f89c8198bef2bd9ae8799 (diff)
downloadxutils-dev-4db5755464b96fee5c7628a509a6694593381950.tar.gz
* Add 06_linux_manpage_suffixes.diff which now creates manpages without the
x suffix on linux
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/06_linux_manpage_suffixes.diff85
-rw-r--r--debian/patches/series1
3 files changed, 89 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8214fc0..bacab2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ xutils-dev (1:7.1.ds-1) UNRELEASED; urgency=low
* Update util-macros to 1.0.2
* Update xorg-cf-files to 1.0.2
* Add a series number for the xaw_without_xp patch
+ * Add 06_linux_manpage_suffixes.diff which now creates manpages without the
+ x suffix on linux
- -- David Nusinow <dnusinow@debian.org> Mon, 29 May 2006 22:54:12 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 29 May 2006 23:49:20 -0400
xutils-dev (1:1.0.2-3) unstable; urgency=low
diff --git a/debian/patches/06_linux_manpage_suffixes.diff b/debian/patches/06_linux_manpage_suffixes.diff
new file mode 100644
index 0000000..3aa8cb4
--- /dev/null
+++ b/debian/patches/06_linux_manpage_suffixes.diff
@@ -0,0 +1,85 @@
+Index: xutils-dev/util-macros/xorg-macros.m4
+===================================================================
+--- xutils-dev.orig/util-macros/xorg-macros.m4 2006-05-29 23:47:30.000000000 -0400
++++ xutils-dev/util-macros/xorg-macros.m4 2006-05-29 23:48:55.000000000 -0400
+@@ -79,40 +79,40 @@
+
+ if test x$APP_MAN_SUFFIX = x ; then
+ case $host_os in
+- linux* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
++ k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
+ *) APP_MAN_SUFFIX=1 ;;
+ esac
+ fi
+ if test x$APP_MAN_DIR = x ; then
+ case $host_os in
+- linux* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
++ k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
+ *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+ esac
+ fi
+
+ if test x$LIB_MAN_SUFFIX = x ; then
+ case $host_os in
+- linux* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
++ k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;;
+ *) LIB_MAN_SUFFIX=3 ;;
+ esac
+ fi
+ if test x$LIB_MAN_DIR = x ; then
+ case $host_os in
+- linux* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
++ k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;;
+ *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+ esac
+ fi
+
+ if test x$FILE_MAN_SUFFIX = x ; then
+ case $host_os in
+- linux* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
++ k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;;
+ solaris*) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
+ esac
+ fi
+ if test x$FILE_MAN_DIR = x ; then
+ case $host_os in
+- linux* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
++ k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
+ *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+ esac
+ fi
+@@ -121,14 +121,14 @@
+ # LinuxDebian, not other Linuxes, so we leave it unchanged here
+ if test x$MISC_MAN_SUFFIX = x ; then
+ case $host_os in
+-# linux* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
++# k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;;
+ solaris*) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
+ esac
+ fi
+ if test x$MISC_MAN_DIR = x ; then
+ case $host_os in
+-# linux* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
++# k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;;
+ *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+ esac
+ fi
+@@ -137,14 +137,14 @@
+ # LinuxDebian, not other Linuxes, so we leave it unchanged here
+ if test x$DRIVER_MAN_SUFFIX = x ; then
+ case $host_os in
+-# linux* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
++# k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
+ solaris*) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
+ esac
+ fi
+ if test x$DRIVER_MAN_DIR = x ; then
+ case $host_os in
+-# linux* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
++# k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+ *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+ esac
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index de8c6a2..ee8e44e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_xutils-dev-FHS.diff -p1
04_xutils-dev-debian.diff
05_xaw_without_xp.diff
+06_linux_manpage_suffixes.diff