wmii

commit c1243c5ad566bd822430de9ab0a21fe3e61ead2f
parent 9950100cc6c3e9df48172e745f32b7bb4d26df5a
Author: Kris Maglione <kris@suckless.org>
Date:   Sun, 25 Oct 2009 14:46:56 -0400

Simplify debian patches.

Diffstat:
debian/patches/01-config-local-mk.patch
 | 
13
+++++++++++++
debian/patches/01-x-terminal-emulator.patch
 | 
15
---------------
debian/patches/02-config-local-mk.patch
 | 
12
------------
debian/patches/series
 | 
3
+--

4 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/debian/patches/01-config-local-mk.patch b/debian/patches/01-config-local-mk.patch
@@ -0,0 +1,13 @@
+Author: Kris Maglione <jg@suckless.org>
+Description: Create a config.local.mk for debian.
+
+diff --git a/config.local.mk b/config.local.mk
+new file mode 100644
+--- /dev/null
++++ b/config.local.mk
+@@ -0,0 +1,5 @@
++DESTDIR=./debian/wmii/
++PREFIX=/usr
++ETC=/etc/X11
++STATIC=
++TERMINAL = x-terminal-emulator
diff --git a/debian/patches/01-x-terminal-emulator.patch b/debian/patches/01-x-terminal-emulator.patch
@@ -1,15 +0,0 @@
-Author: Kris Maglione <jg@suckless.org>
-Description: Use x-terminal-emulator as the default terminal.
-
-diff --git a/config.mk b/config.mk
---- a/config.mk
-+++ b/config.mk
-@@ -13,7 +13,7 @@
- INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include
- LIBS = -L$(ROOT)/lib -L/usr/lib
- 
--TERMINAL = xterm
-+TERMINAL = x-terminal-emulator
- 
- # Flags
- include $(ROOT)/mk/gcc.mk
diff --git a/debian/patches/02-config-local-mk.patch b/debian/patches/02-config-local-mk.patch
@@ -1,12 +0,0 @@
-Author: Kris Maglione <jg@suckless.org>
-Description: Create a config.local.mk for debian.
-
-diff --git a/config.local.mk b/config.local.mk
-new file mode 100644
---- /dev/null
-+++ b/config.local.mk
-@@ -0,0 +1,4 @@
-+DESTDIR=./debian/wmii/
-+PREFIX=/usr
-+ETC=/etc/X11
-+STATIC=
diff --git a/debian/patches/series b/debian/patches/series
@@ -1,2 +1 @@
-01-x-terminal-emulator.patch
-02-config-local-mk.patch
+01-config-local-mk.patch