xserver-xorg-input-evdev: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 27 +++++++
debian/changelog | 9 ++
debian/control | 2
debian/patches/evdev_man_illegal_char.patch | 12 ---
debian/patches/series | 1
debian/xsfbs/xsfbs.mk | 50 +++++---------
debian/xsfbs/xsfbs.sh | 7 --
man/evdev.man | 95 ++++++++++++++++------------
9 files changed, 111 insertions(+), 93 deletions(-)
New commits:
commit 1a1d52dfe4b401d952c5ccf147a6ab0d92e112f3
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 6 17:06:17 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index dfb8f4d..2ca7c7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low
* New upstream releases
+ includes manpage fixes from Peter Samuelson (close: #446118)
+ drop evdev_man_illegal_char.patch, included upstream
* Bump Standards-Version to 3.7.3.
- -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 17:05:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 17:05:24 +0100
xserver-xorg-input-evdev (1:1.2.0~git20070819-4) unstable; urgency=low
commit 0e1861b529c5982ece7c492c6cb89408e87fe792
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 6 17:05:14 2007 +0100
* Bump Standards-Version to 3.7.3.
diff --git a/debian/changelog b/debian/changelog
index 24f47af..dfb8f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-input-evdev (1:1.2.0-1) UNRELEASED; urgency=low
* New upstream releases
+ includes manpage fixes from Peter Samuelson (close: #446118)
+ drop evdev_man_illegal_char.patch, included upstream
+ * Bump Standards-Version to 3.7.3.
- -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 16:53:46 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 17:05:02 +0100
xserver-xorg-input-evdev (1:1.2.0~git20070819-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f29c283..2fa7cd3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git
commit d51e0d6fd5f0b8c79da8c175f6d5052c48edde59
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 6 16:54:21 2007 +0100
drop evdev_man_illegal_char.patch, included upstream
diff --git a/debian/changelog b/debian/changelog
index d08b0ca..24f47af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-evdev (1:1.2.0-1) UNRELEASED; urgency=low
* New upstream releases
+ includes manpage fixes from Peter Samuelson (close: #446118)
+ + drop evdev_man_illegal_char.patch, included upstream
- -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 16:51:39 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 16:53:46 +0100
xserver-xorg-input-evdev (1:1.2.0~git20070819-4) unstable; urgency=low
diff --git a/debian/patches/evdev_man_illegal_char.patch b/debian/patches/evdev_man_illegal_char.patch
deleted file mode 100644
index 74def71..0000000
--- a/debian/patches/evdev_man_illegal_char.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xserver-xorg-input-evdev/man/evdev.man
-===================================================================
---- xserver-xorg-input-evdev.orig/man/evdev.man 2007-02-01 01:39:12.000000000 +0100
-+++ xserver-xorg-input-evdev/man/evdev.man 2007-02-01 01:39:23.000000000 +0100
-@@ -317,6 +317,6 @@
- .SH AUTHORS
- Zephaniah E. Hull.
- .fi
--Kristian Høgsberg.
-+Kristian H\(/ogsberg.
- .SH "SEE ALSO"
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
diff --git a/debian/patches/series b/debian/patches/series
index eb2de80..ccab2ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-evdev_man_illegal_char.patch
evdev_no_flush_on_init.diff
commit 7ea134d39afedecaab72e1b23eef1e5c7f247c7a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 6 16:52:57 2007 +0100
Update changelogs for new upstream release.
diff --git a/ChangeLog b/ChangeLog
index 4ded79c..9b40170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+commit fa15e909933252d5cc0a2a272506effbcf21d6f9
+Author: Peter Samuelson <peter@p12n.org>
+Date: Thu Oct 11 07:27:30 2007 +0200
+
+ Fix one additional typo in evdev.man (axis named BRAKE, not BREAK).
+
+commit 12a27693b9bb41b9222c5c2256815d225ee75929
+Author: Peter Samuelson <peter@p12n.org>
+Date: Thu Oct 11 00:09:40 2007 +0200
+
+ evdev.man minor fixes
+
+ * Use \- (ASCII dash) instead of - (hyphen), where appropriate
+ * Use a roff escape instead of a UTF-8 character.
+ * Consistent use of quote characters.
+ * Consistent use of typographic conventions:
+ italic "n" in place of "<N>" or "integer" or "number",
+ bold for option names, bit maps, etc.
+
+ Debian bug #446118
+
+commit 1c40c7db188bc9030aaf256004b914815e821940
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:08 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
commit e2be2ffa473583b98b93a319163bb54eb5d83ed6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 00:02:33 2007 +0300
diff --git a/debian/changelog b/debian/changelog
index 3f19a1a..d08b0ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:1.2.0-1) UNRELEASED; urgency=low
+
+ * New upstream releases
+ + includes manpage fixes from Peter Samuelson (close: #446118)
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 06 Dec 2007 16:51:39 +0100
+
xserver-xorg-input-evdev (1:1.2.0~git20070819-4) unstable; urgency=low
* New patch evdev_no_flush_on_init.diff: don't send button release events on
commit fa15e909933252d5cc0a2a272506effbcf21d6f9
Author: Peter Samuelson <peter@p12n.org>
Date: Thu Oct 11 07:27:30 2007 +0200
Fix one additional typo in evdev.man (axis named BRAKE, not BREAK).
diff --git a/man/evdev.man b/man/evdev.man
index 3026efe..2a11945 100644
--- a/man/evdev.man
+++ b/man/evdev.man
@@ -253,7 +253,7 @@ and map the Wheel axis to buttons 4 5, you get buttons 1 2 3
.SS ABSOLUTE AXIS CONFIGURATION
The relative axis portion of this driver handle all reported relative axes.
.fi
-The axes are named X, Y, Z, RX, RY, RZ, THROTTLE, RUDDER, WHEEL, GAS, BREAK,
+The axes are named X, Y, Z, RX, RY, RZ, THROTTLE, RUDDER, WHEEL, GAS, BRAKE,
<11\-15>, HAT0X, HAT0Y, HAT1X, HAT1Y, HAT2X, HAT2Y, HAT3X, HAT3Y, PRESSURE,
TILT_X, TILT_Y, TOOL_WIDTH, VOLUME, <29\-39>, MISC, <41\-62>.
.fi
commit 12a27693b9bb41b9222c5c2256815d225ee75929
Author: Peter Samuelson <peter@p12n.org>
Date: Thu Oct 11 00:09:40 2007 +0200
evdev.man minor fixes
* Use \- (ASCII dash) instead of - (hyphen), where appropriate
* Use a roff escape instead of a UTF-8 character.
* Consistent use of quote characters.
* Consistent use of typographic conventions:
italic "n" in place of "<N>" or "integer" or "number",
bold for option names, bit maps, etc.
Debian bug #446118
diff --git a/man/evdev.man b/man/evdev.man
index 2395cd8..3026efe 100644
--- a/man/evdev.man
+++ b/man/evdev.man
@@ -14,7 +14,7 @@ evdev \- Generic Linux input driver
.fi
.SH DESCRIPTION
.B evdev
-is an __xservername__ input driver for Linux\'s generic event devices. It
+is an __xservername__ input driver for Linux's generic event devices. It
therefore supports all input devices that the kernel knows about, including
most mice and keyboards.
.PP
@@ -46,7 +46,7 @@ all QWERTY keyboards:
.BI " Identifier \*q" keyboard \*q
.B " Driver \*qevdev\*q"
.BI " Option \*qevBits\*q \*q" "+1" \*q
-.BI " Option \*qkeyBits\*q \*q" "~1-255 ~352-511" \*q
+.BI " Option \*qkeyBits\*q \*q" "~1\-255 ~352\-511" \*q
.BI " Option \*qPass\*q \*q" "3" \*q
\ \ ...
.B EndSection
@@ -58,9 +58,9 @@ And the following for all mice:
.B "Section \*qInputDevice\*q"
.BI " Identifier \*q" mouse \*q
.B " Driver \*qevdev\*q"
-.BI " Option \*qevBits\*q \*q" "+1-2" \*q
-.BI " Option \*qkeyBits\*q \*q" "~272-287" \*q
-.BI " Option \*qrelBits\*q \*q" "~0-2 ~6 ~8" \*q
+.BI " Option \*qevBits\*q \*q" "+1\-2" \*q
+.BI " Option \*qkeyBits\*q \*q" "~272\-287" \*q
+.BI " Option \*qrelBits\*q \*q" "~0\-2 ~6 ~8" \*q
.BI " Option \*qPass\*q \*q" "3" \*q
\ \ ...
.B EndSection
@@ -86,8 +86,11 @@ control what devices are accepted:
.TP 7
.BI "Option \*qDevice\*q \*q" string \*q
Specifies the device note through which the device can be accessed.
-At this time ONLY /dev/input/event<N>, where <N> is an integer, are
-matched against this this field.
+At this time ONLY
+.RI /dev/input/event n ,
+where
+.I n
+is an integer, are matched against this this field.
.fi
This option uses globbing.
.fi
@@ -120,25 +123,29 @@ is the value you want for this option.
This option uses globbing.
.TP 7
-.BI "Option \*q<map>Bits\*q \*q" "bit specifier" \*q
+.BI "Option \*q" map "Bits\*q \*q" "bit specifier" \*q
Specifies device capability bits which must be set, possibly set, or unset.
.fi
-<map>Bits: Where map is one of ev, key, rel, abs, msc, led, snd, or
-ff.
+.IR map "Bits: Where " map
+is one of
+.BR ev ", " key ", " rel ", " abs ,
+.BR msc ", " led ", " snd ", or " ff .
.fi
-The bit specifier format is a string consisting of +<n>, -<n>, and ~<n>
-space separated specifiers, where <n> is a positive integer or integer range.
-(The latter given in the format of 2-6.)
+The bit specifier format is a string consisting of
+.RI + n ", \-" n ", and ~" n
+space-separated specifiers, where
+.I n
+is a positive integer or integer range. (The latter given in the format of 2\-6.)
.fi
+ specifies bits which must be set.
.fi
-- specifies bits which must not be set.
+\- specifies bits which must not be set.
.fi
~ is a little more complex, it specifies that at least one of the bits given
with ~ for the field in question must be set, but it doesn't matter how many
or which of the bits. (It is actually the most useful of the 3 specifiers.)
.fi
-As an example '+0 +3 -1-2 ~5-10', requires bits 0 and 3 be set,
+As an example, \*q+0 +3 \-1\-2 ~5\-10\*q requires bits 0 and 3 be set,
bits 1 and 2 to not be set, and at least one bit in the range of 5 to
10 be set.
.fi
@@ -148,20 +155,24 @@ by typing \*qcat /proc/bus/input/devices\*q, and
should contain the defines which declare what bits are what for each field.
.TP 7
-.BI "Option \*qbustype\*q \*q" integer \*q
+.BI "Option \*qbustype\*q \*q" n \*q
Specifies the bus ID for the device you wish to use.
.fi
-This is either 0 (the default, matches anything), or the Bus=<n> field in
+This is either 0 (the default, matches anything), or the
+.BI Bus= n
+field in
.B /proc/bus/input/devices
for your device.
.fi
This value depends on what type of bus your device is connected to.
.TP 7
-.BI "Option \*qvendor\*q \*q" integer \*q
+.BI "Option \*qvendor\*q \*q" n \*q
Specifies the vendor ID for the device you wish to use.
.fi
-This is either 0 (the default, matches anything), or the Vendor=<n> field in
+This is either 0 (the default, matches anything), or the
+.BI Vendor= n
+field in
.B /proc/bus/input/devices
for your device.
.fi
@@ -169,10 +180,12 @@ This value should remain constant barring perhaps firmware updates to the
device itself.
.TP 7
-.BI "Option \*qversion\*q \*q" integer \*q
+.BI "Option \*qversion\*q \*q" n \*q
Specifies the version for the device you wish to use.
.fi
-This is either 0 (the default, matches anything), or the Version=<n> field in
+This is either 0 (the default, matches anything), or the
+.BI Version= n
+field in
.B /proc/bus/input/devices
for your device.
.fi
@@ -180,10 +193,12 @@ This value should remain constant barring perhaps firmware updates to the
device itself.
.TP 7
-.BI "Option \*qproduct\*q \*q" integer \*q
+.BI "Option \*qproduct\*q \*q" n \*q
Specifies the product ID for the device you wish to use.
.fi
-This is either 0 (the default, matches anything), or the Product=<n> field in
+This is either 0 (the default, matches anything), or the
+.BI Product= n
+field in
.B /proc/bus/input/devices
for your device.
.fi
@@ -191,7 +206,7 @@ This value should remain constant barring perhaps firmware updates to the
device itself.
.TP 7
-.BI "Option \*qPass\*q \*q" integer \*q
+.BI "Option \*qPass\*q \*q" n \*q
Specifies the order in which evdev will scan for devices.
.fi
This is in the range of 0 to 3, and is used for the case
@@ -223,13 +238,13 @@ The following driver
.B Options
control the relative axis portion of the driver:
.TP 7
-.BI "Option \*q<axis>RelativeAxisMap\*q \*q" number \*q
+.BI "Option \*q" axis "RelativeAxisMap\*q \*q" n \*q
This remaps the axis specified to the specified valuator.
.TP 7
-.BI "Option \*q<axis>RelativeAxisButtons\*q \*q" number " number\*q
+.BI "Option \*q" axis "RelativeAxisButtons\*q \*q" "n n" \*q
This remaps the axis specified to the specified buttons.
.fi
-Note that the physical buttons are always remapped around 'fake' buttons
+Note that the physical buttons are always remapped around \*qfake\*q buttons
created by this option, so that if you have physical buttons 1 2 3 4 5,
and map the Wheel axis to buttons 4 5, you get buttons 1 2 3
.B 4 5
@@ -239,8 +254,8 @@ and map the Wheel axis to buttons 4 5, you get buttons 1 2 3
The relative axis portion of this driver handle all reported relative axes.
.fi
The axes are named X, Y, Z, RX, RY, RZ, THROTTLE, RUDDER, WHEEL, GAS, BREAK,
-<11-15>, HAT0X, HAT0Y, HAT1X, HAT1Y, HAT2X, HAT2Y, HAT3X, HAT3Y, PRESSURE,
-TILT_X, TILT_Y, TOOL_WIDTH, VOLUME, <29-39>, MISC, <41-62>.
+<11\-15>, HAT0X, HAT0Y, HAT1X, HAT1Y, HAT2X, HAT2Y, HAT3X, HAT3Y, PRESSURE,
+TILT_X, TILT_Y, TOOL_WIDTH, VOLUME, <29\-39>, MISC, <41\-62>.
.fi
The axes are reported to X as valuators, with the default mapping of axes
to valuators being the first axes found to the first valuator, the second
@@ -254,21 +269,21 @@ The following driver
.B Options
control the relative axis portion of the driver:
.TP 7
-.BI "Option \*q<axis>AbsoluteAxisMap\*q \*q" number \*q
+.BI "Option \*q" axis "AbsoluteAxisMap\*q \*q" n \*q
This remaps the axis specified to the specified valuator.
.TP 7
-.BI "Option \*qAbsoluteScreen\*q \*q" number \*q
+.BI "Option \*qAbsoluteScreen\*q \*q" n \*q
This binds the device to a specific screen, scaling it to
the coordinate space of that screen.
.fi
-The number can either be -1, or a valid screen number.
+The number can either be \-1, or a valid screen number.
.fi
-If -1 or if in relative mode no scaling or screen fixing is done.
+If \-1 or if in relative mode no scaling or screen fixing is done.
.fi
This is of most use for digitizers, where the screen and the input
device are the same surface.
.TP 7
-.BI "Option \*qMode\*q \*q" <mode>\*q
+.BI "Option \*qMode\*q \*q" mode \*q
This selects the default mode for the device.
.fi
Valid values are \*qabsolute\*q and \*qrelative\*q.
@@ -277,7 +292,7 @@ This can be set at run time per actual device with the xinput utility.
.PP
.SS BUTTON CONFIGURATION
At the moment, the button portion of this driver only handles buttons
-reported as mouse buttons, that is from BTN_MOUSE to BTN_JOYSTICK - 1.
+reported as mouse buttons, that is from BTN_MOUSE to BTN_JOYSTICK \- 1.
.fi
At this time there are no configuration options for buttons.
.SS KEYBOARD CONFIGURATION
@@ -295,15 +310,15 @@ specifies which XKB rules file to use for interpreting the
.BR XkbVariant ,
and
.B XkbOptions
-settings. Default: "xorg" for most platforms, but "xfree98" for the
+settings. Default: \*qxorg\*q for most platforms, but \*qxfree98\*q for the
Japanese PC-98 platforms.
.TP 7
.BI "Option \*qXkbModel\*q \*q" modelname \*q
-specifies the XKB keyboard model name. Default: "evdev".
+specifies the XKB keyboard model name. Default: \*qevdev\*q.
.TP 7
.BI "Option \*qXkbLayout\*q \*q" layoutname \*q
specifies the XKB keyboard layout name. This is usually the country or
-language type of the keyboard. Default: "us".
+language type of the keyboard. Default: \*qus\*q.
.TP 7
.BI "Option \*qXkbVariant\*q \*q" variants \*q
specifies the XKB keyboard variant components. These can be used to
@@ -317,6 +332,6 @@ enhance the keyboard behaviour. Default: not set.
.SH AUTHORS
Zephaniah E. Hull.
.fi
-Kristian Høgsberg.
+Kristian H\(/ogsberg.
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Sep 22 23:49:11 2007 -0400
Remove make-orig-tar-gz target
This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file. Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
-# for the rare situations when one is needed.
-.PHONY: make-orig-tar-gz
-make-orig-tar-gz: clean prune-upstream-tree
- ( cd .. \
- && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \
- echo "Our current working directory has the wrong name. Renaming..." >&2; \
- mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \
- fi; \
- tar --exclude=debian --exclude=debian/* \
- --exclude=.svn --exclude=.svn/* \
- -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \
- | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \
- )
-
# Verify that there are no offsets or fuzz in the patches we apply.
#
# Note: This rule is for Debian package maintainers' convenience, and is not
commit 1c40c7db188bc9030aaf256004b914815e821940
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:08 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index da4f97a..df3de77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ ltmain.sh
missing
stamp-h1
.*.swp
+*~
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
Reply to: