← Back to branch summary

~ubuntu-branches/ubuntu/natty/procps/natty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/30_watch_exec_beep.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-06-03 07:28:56 UTC
  • mfrom: (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090603072856-zbj1y7nvc1bquf1o
Tags: 1:3.2.8-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/rules (Ubuntu-specific):
    - set init script to priority 17.
    - install sysctl files from new sysctl.d directory.
    - append debian/sysctl.d/*.conf.$DEB_HOST_ARCH to 10-arch-specific.conf
  - debian/sysctl.d (Ubuntu-specific):
    - 10-console-messages.conf: stop low-level kernel messages on console.
    - 10-network-security.conf: enable rp_filter and SYN-flood protection.
    - 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
  - Drop conf-file-cleanups in debian/{preinst,postinst,postrm}.
  - Drop pre-Hardy rcS.d procps.sh cleanups in debian/postinst.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/30_watch_exec_beep.dpatch
6
6
## DP: Adds -errexit flag now too #183346
7
7
 
8
8
@DPATCH@
9
 
diff -urNad procps-3.2.7~/watch.1 procps-3.2.7/watch.1
10
 
--- procps-3.2.7~/watch.1       2009-01-11 12:11:47.000000000 +1100
11
 
+++ procps-3.2.7/watch.1        2009-01-11 12:18:31.000000000 +1100
12
 
@@ -1,13 +1,16 @@
13
 
-.TH WATCH 1 "1999 Apr 3" " " "Linux User's Manual"
14
 
+.TH WATCH 1 "2008 Jan 8" " " "Linux User's Manual"
15
 
 .SH NAME
16
 
 watch \- execute a program periodically, showing output fullscreen
 
9
diff -urNad procps-3.2.8~/watch.1 procps-3.2.8/watch.1
 
10
--- procps-3.2.8~/watch.1       2009-05-28 17:27:41.000000000 +1000
 
11
+++ procps-3.2.8/watch.1        2009-05-28 17:28:28.000000000 +1000
 
12
@@ -4,10 +4,13 @@
17
13
 .SH SYNOPSIS
18
14
 .na
19
15
 .B watch
81
77
-Mike Coleman <mkc@acm.org> in 1999.
82
78
+Mike Coleman <mkc@acm.org> in 1999.  The beep, exec, and error handling 
83
79
+features were added by Morty Abzug <morty@frakir.org> in 2008.
84
 
diff -urNad procps-3.2.7~/watch.c procps-3.2.7/watch.c
85
 
--- procps-3.2.7~/watch.c       2009-01-11 12:11:47.000000000 +1100
86
 
+++ procps-3.2.7/watch.c        2009-01-11 12:21:50.000000000 +1100
 
80
diff -urNad procps-3.2.8~/watch.c procps-3.2.8/watch.c
 
81
--- procps-3.2.8~/watch.c       2009-05-28 17:27:41.000000000 +1000
 
82
+++ procps-3.2.8/watch.c        2009-05-28 17:27:42.000000000 +1000
87
83
@@ -8,6 +8,7 @@
88
84
  * Mike Coleman <mkc@acm.org>.
89
85
  *