[Pkg-wmaker-commits] [wmsysmon] 13/37: debian/patches: Convert patches from dpatch to quilt, add DEP3 headers, and rename from *.dpatch to *.patch.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:09:47 UTC 2015


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmsysmon.

commit a301e2105957d3675680894b31f41ebe9b966616
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sun Jul 12 10:21:58 2015 -0600

    debian/patches: Convert patches from dpatch to quilt, add DEP3 headers,
    and rename from *.dpatch to *.patch.
---
 debian/patches/00list                                  |  4 ----
 debian/patches/01-break.dpatch                         | 16 ----------------
 debian/patches/01-break.patch                          | 14 ++++++++++++++
 debian/patches/{02-output.dpatch => 02-output.patch}   | 16 +++++++---------
 .../{03-src_makefile.dpatch => 03-src_makefile.patch}  | 13 +++++--------
 debian/patches/04-makefile-strip.dpatch                | 18 ------------------
 debian/patches/04-makefile-strip.patch                 | 15 +++++++++++++++
 debian/patches/series                                  |  4 ++++
 8 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 900b2b4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01-break.dpatch
-02-output.dpatch
-03-src_makefile.dpatch
-04-makefile-strip.dpatch
diff --git a/debian/patches/01-break.dpatch b/debian/patches/01-break.dpatch
deleted file mode 100644
index 688dde1..0000000
--- a/debian/patches/01-break.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-break.dpatch by Luca Bedogni <me at lucabedogni.it>
-##
-## DP: Add a break to wmsysmon.c at the end of a switch statement.
-
- at DPATCH@
-
---- wmsysmon-0.7.7/src/wmsysmon.c	2007-03-16 23:26:00.000000000 +0100
-+++ wmsysmon-0.7.7/src/wmsysmon.c	2007-03-14 01:01:41.000000000 +0100
-@@ -288,6 +288,7 @@
- #ifdef MONDEBUG
- 				printf("got: %i\n", Event.type);
- #endif
-+        break;
- 			}
- 		}
diff --git a/debian/patches/01-break.patch b/debian/patches/01-break.patch
new file mode 100644
index 0000000..d7bde83
--- /dev/null
+++ b/debian/patches/01-break.patch
@@ -0,0 +1,14 @@
+Description: Add a break to wmsysmon.c at the end of a switch statement.
+Author: Luca Bedogni <me at lucabedogni.it>
+Last-Update: 2015-07-12
+
+--- a/src/wmsysmon.c
++++ b/src/wmsysmon.c
+@@ -288,6 +288,7 @@
+ #ifdef MONDEBUG
+ 				printf("got: %i\n", Event.type);
+ #endif
++        break;
+ 			}
+ 		}
+ 
diff --git a/debian/patches/02-output.dpatch b/debian/patches/02-output.patch
similarity index 61%
rename from debian/patches/02-output.dpatch
rename to debian/patches/02-output.patch
index 2dfdcc9..6923a03 100644
--- a/debian/patches/02-output.dpatch
+++ b/debian/patches/02-output.patch
@@ -1,13 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-output.dpatch by Luca Bedogni <me at lucabedogni.it>
-##
-## DP: Corrects a typo in wmsysmon output.
+Description: Corrects a typo in wmsysmon output.
+Author: Luca Bedogni <me at lucabedogni.it>
+Last-Update: 2015-07-12
 
- at DPATCH@
-
---- wmsysmon-0.7.7/src/wmsysmon.c	2007-03-16 23:26:00.000000000 +0100
-+++ wmsysmon-0.7.7/src/wmsysmon.c	2007-03-16 23:27:17.000000000 +0100
-@@ -851,10 +851,10 @@
+--- a/src/wmsysmon.c
++++ b/src/wmsysmon.c
+@@ -852,10 +852,10 @@
  #ifdef HI_INTS
  			"| 01234567   UV   |  <--- 0-N are hardware interrupts 0-23\n"
  			"| 89ABCDEF   WX   |  <--- U,V are Page IN/OUT, W,X are Swap IN/OUT\n"
@@ -19,3 +16,4 @@
 +			"| 89ABCDEF   YZ   |  <--- W,X are Page IN/OUT, Y,Z are Swap IN/OUT\n"
  #endif
  			"-------------------\n");
+ 
diff --git a/debian/patches/03-src_makefile.dpatch b/debian/patches/03-src_makefile.patch
similarity index 66%
rename from debian/patches/03-src_makefile.dpatch
rename to debian/patches/03-src_makefile.patch
index af79d47..7b5b457 100644
--- a/debian/patches/03-src_makefile.dpatch
+++ b/debian/patches/03-src_makefile.patch
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-src_makefile.dpatch by Luca Bedogni <me at lucabedogni.it>
-##
-## DP: Change Makefile to fit debian policy
+Description: Change Makefile to fit debian policy
+Author: Luca Bedogni <me at lucabedogni.it>
+Last-Update: 2015-07-12
 
- at DPATCH@
-
---- wmsysmon-0.7.7/src/Makefile	2001-12-24 08:01:43.000000000 +0100
-+++ wmsysmon-0.7.7/src/Makefile	2007-03-14 00:43:12.000000000 +0100
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -3,7 +3,7 @@
  LIBDIR += -L/usr/X11R6/lib
  LDFLAGS += -lXpm -lXext -lX11 -lm -s
diff --git a/debian/patches/04-makefile-strip.dpatch b/debian/patches/04-makefile-strip.dpatch
deleted file mode 100644
index 290edf9..0000000
--- a/debian/patches/04-makefile-strip.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-makefile-strip.dpatch by Luca Bedogni <me at lucabedogni.it>
-##
-## DP: Delete automatic stripping of binary
-
- at DPATCH@
-
---- wmsysmon-0.7.7/Makefile	2007-08-16 16:15:32.000000000 +0200
-+++ wmsysmon-0.7.7/Makefile	2007-08-16 16:14:27.000000000 +0200
-@@ -1,7 +1,7 @@
- CC = gcc
- 
- LIBDIR += -L/usr/X11R6/lib
--LDFLAGS += -lXpm -lXext -lX11 -lm -s
-+LDFLAGS += -lXpm -lXext -lX11 -lm
- #CFLAGS = -g #-DMONDEBUG
- CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
- 
diff --git a/debian/patches/04-makefile-strip.patch b/debian/patches/04-makefile-strip.patch
new file mode 100644
index 0000000..6d58677
--- /dev/null
+++ b/debian/patches/04-makefile-strip.patch
@@ -0,0 +1,15 @@
+Description: Delete automatic stripping of binary
+Author: Luca Bedogni <me at lucabedogni.it>
+Last-Update: 2015-07-12
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ CC = gcc
+ 
+ LIBDIR += -L/usr/X11R6/lib
+-LDFLAGS += -lXpm -lXext -lX11 -lm -s
++LDFLAGS += -lXpm -lXext -lX11 -lm
+ #CFLAGS = -g #-DMONDEBUG
+ CFLAGS += -Wall -O3 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ca0f577
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-break.patch
+02-output.patch
+03-src_makefile.patch
+04-makefile-strip.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmsysmon.git



More information about the Pkg-wmaker-commits mailing list