1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 10debian.dpatch by <lamont@debian.org>
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: Debian specific configuration changes
8
diff -urNad util-linux/MCONFIG /tmp/dpep.BP9ADw/util-linux/MCONFIG
9
--- util-linux/MCONFIG 2004-12-15 11:41:41.633346075 -0700
10
+++ /tmp/dpep.BP9ADw/util-linux/MCONFIG 2004-12-15 17:01:42.932876625 -0700
12
# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
13
# will use PAM for authentication. Additionally, passwd will not be
14
# installed as it is not PAM aware.
18
# If HAVE_SELINUX is set to "yes", the login will make sure the user is
19
# logged into an appropriate security context
21
# not be built or installed from the login-utils subdirectory. (The
22
# shutdown and init from the SysVinit package do not depend on the last,
23
# mesg, and wall from that package.)
24
-HAVE_SYSVINIT_UTILS=yes
25
+HAVE_SYSVINIT_UTILS=no
27
# If HAVE_WRITE is set to "yes", then write will not be built or
28
# installed from the misc-utils subdirectory.
31
# Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk)
32
# (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.)
35
# There is a subdirectory /usr/include/slang containing slcurses.h
36
# SLANGFLAGS=-I/usr/include/slang
37
# No such subdirectory - slcurses.h lives in /usr/include
41
USRGAMES_DIR= /usr/games
42
-USRSHAREMISC_DIR=/usr/share/misc
43
+USRSHAREMISC_DIR=/usr/share/util-linux
44
LOCALE_DIR= /usr/share/locale
47
diff -urNad util-linux/getopt/getopt.1 /tmp/dpep.BP9ADw/util-linux/getopt/getopt.1
48
--- util-linux/getopt/getopt.1 2004-12-15 11:41:41.634345860 -0700
49
+++ /tmp/dpep.BP9ADw/util-linux/getopt/getopt.1 2004-12-15 17:01:42.932876625 -0700
51
Example scripts for (ba)sh and (t)csh are provided with the
53
distribution, and are optionally installed in
54
-.B /usr/local/lib/getopt
57
-.BR /usr/lib/getopt .
58
+.B /usr/local/lib/getopt
59
+(if you have created it).
62
This environment variable is examined by the
63
diff -urNad util-linux/hwclock/hwclock.8 /tmp/dpep.BP9ADw/util-linux/hwclock/hwclock.8
64
--- util-linux/hwclock/hwclock.8 2004-12-15 16:33:16.000000000 -0700
65
+++ /tmp/dpep.BP9ADw/util-linux/hwclock/hwclock.8 2004-12-15 17:01:42.932876625 -0700
69
.I /usr/share/zoneinfo/
70
-.RI ( /usr/lib/zoneinfo
79
+.BR /etc/init.d/hwclock.sh,
80
+.BR /usr/share/doc/util-linux/README.Debian.hwclock
84
Written by Bryan Henderson, September 1996 (bryanh@giraffe-data.com),
85
diff -urNad util-linux/mount/README.mount /tmp/dpep.BP9ADw/util-linux/mount/README.mount
86
--- util-linux/mount/README.mount 2004-12-15 11:41:41.634345860 -0700
87
+++ /tmp/dpep.BP9ADw/util-linux/mount/README.mount 2004-12-15 17:01:42.933876410 -0700
89
Presently maintained by Andries Brouwer <aeb@cwi.nl>.
90
Ftp site: ftp.win.tue.nl:/pub/linux/utils/util-linux
92
+http://freshmeat.net/projects/util-linux/ tends to be current as well.
93
diff -urNad util-linux/mount/my_dev_t.h /tmp/dpep.BP9ADw/util-linux/mount/my_dev_t.h
94
--- util-linux/mount/my_dev_t.h 2004-12-15 11:41:41.635345645 -0700
95
+++ /tmp/dpep.BP9ADw/util-linux/mount/my_dev_t.h 2004-12-15 17:01:42.933876410 -0700
97
/* glibc uses a different dev_t */
99
#include <linux/posix_types.h>
100
-#include <linux/version.h>
102
-#ifndef KERNEL_VERSION
103
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
106
-#if LINUX_VERSION_CODE < KERNEL_VERSION(1,3,78)
107
-/* for i386 - alpha uses unsigned int */
108
-#define my_dev_t unsigned short
110
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68)
111
-#define my_dev_t __kernel_dev_t
113
#define my_dev_t __kernel_old_dev_t