[Pkg-wmaker-commits] [wmshutdown] 46/173: debian/patches: rm *.dpatch

[Doug Torrance]

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

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

commit 2df0261b93e0ff2606e4c42ee896dc961db6350e
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Thu Dec 17 11:56:57 2009 +0200

    debian/patches: rm *.dpatch
    
    Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
 debian/patches/00list                |  2 --
 debian/patches/10-makefile.dpatch    | 62 ------------------------------------
 debian/patches/10-name-change.dpatch | 45 --------------------------
 3 files changed, 109 deletions(-)

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ada44ce..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10-makefile.dpatch
-10-name-change.dpatch
diff --git a/debian/patches/10-makefile.dpatch b/debian/patches/10-makefile.dpatch
deleted file mode 100755
index fc9ce51..0000000
--- a/debian/patches/10-makefile.dpatch
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## /tmp/makefile.patch.dpatch by  <jari.aalto at cante.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: e
-## DP: Author: Jari Aalto <jari.aalto at cante.net>
-## DP: 
-## DP: 
-## DP:     Makefile: chnage name. Fix linking
-## DP:     
-## DP:     Signed-off-by: Jari Aalto <jari.aalto at cante.net>
-
- at DPATCH@
-
-diff --git a/Makefile b/Makefile
-index 219e871..9d9d765 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,11 @@
--all:
-+
-+LDFLAGS  = -Wl,--no-add-needed
-+INCFLAGS = -I/usr/include/gtk-2.0
-+LIBS	 = -lX11
-+
-+all: dock shutdown
-+
-+help:
- 	@echo "wmShutdown version 0.1 - Rafael V. Aroca <rafael at linuxqos.cjb.net>"
- 	@echo "Order of makes to install: dock, shutdown, install"
- 
-@@ -8,22 +15,19 @@ clean:
- 	rm -f Shutdown
- 
- install:
--	install wmShutdown /usr/local/bin
--	install wmShutdown.xpm /usr/share/pixmaps/
--	install -g root -o root Shutdown /usr/local/bin
--	chmod +s /sbin/shutdown
--	chmod +s /usr/local/bin/Shutdown
--	@echo Installed. Just type wmShutdown to use it
-+	install -m 755 wmShutdown $(DESTDIR)/usr/bin/wmshutdown
-+	install -m 644 wmShutdown.xpm $(DESTDIR)/usr/share/pixmaps/wmshutdown.xpm
-+	install -m 755 Shutdown $(DESTDIR)/usr/bin/wmshutdown-run
- 
- uninstall:
--	rm -f /usr/local/bin/wmShutdown
--	rm -f /usr/local/bin/Shutdown
-+	rm -f /bin/wmShutdown
-+	rm -f /bin/Shutdown
- 	rm -f /usr/share/pixmaps/wmShutdown.xpm
- 	@echo ":-( Uninstalled."
- 
- dock: wmShutdown.c
--	$(CC) -c -o wmShutdown.o wmShutdown.c `gtk-config --cflags` 
--	$(CC) -o wmShutdown wmShutdown.o `gtk-config --libs` 
-+	$(CC) $(INCFLAGS) -c -o wmShutdown.o wmShutdown.c `pkg-config --cflags gtk+-2.0`
-+	$(CC) $(LDFLAGS) -o wmShutdown wmShutdown.o `pkg-config --libs gtk+-2.0` $(LIBS)
- 
- shutdown: shutdown.c
--	$(CC) -o Shutdown shutdown.c 
-+	$(CC) $(LDFLAGS) $(INCFLAGS) -o Shutdown shutdown.c
diff --git a/debian/patches/10-name-change.dpatch b/debian/patches/10-name-change.dpatch
deleted file mode 100755
index 09e72d3..0000000
--- a/debian/patches/10-name-change.dpatch
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## /tmp/name-change.patch.dpatch by  <jari.aalto at cante.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fb
-## DP: Author: Jari Aalto <jari.aalto at cante.net>
-## DP: 
-## DP: 
-## DP:     wmShutdown.c: change names
-## DP:     
-## DP:     Signed-off-by: Jari Aalto <jari.aalto at cante.net>
-
- at DPATCH@
-
-diff --git a/wmShutdown.c b/wmShutdown.c
-index 7f7e14e..f03f4b9 100644
---- a/wmShutdown.c
-+++ b/wmShutdown.c
-@@ -57,7 +57,7 @@ int desliga(void) {
- 	FILE *output;
- 	char *teste;
- 
--	output = popen("/usr/local/bin/Shutdown -h", "r");
-+	output = popen("/usr/bin/wmshutdown -h", "r");
- 	teste = (char*) fgetc(output);
- 	while ((int)teste != EOF) {
- 		g_print("%c", teste);
-@@ -70,7 +70,7 @@ int reinicia(void) {
- 	FILE *output;
- 	char *teste;
- 
--	output = popen("/usr/local/bin/Shutdown -r", "r");
-+	output = popen("/usr/bin/wmshutdown-run -r", "r");
- 	teste = (char*) fgetc(output);
- 	while ((int)teste != EOF) {
- 		g_print("%c", teste);
-@@ -148,7 +148,7 @@ int main(int argc, char *argv[]) {
- 	gtk_widget_realize(dockArea);	    
- 
-         icon = (gpointer) gdk_pixmap_create_from_xpm (gtkiw->window, &mask,
--                	NULL, "/usr/share/pixmaps/wmShutdown.xpm");
-+                	NULL, "/usr/share/pixmaps/wmshutdown.xpm");
- 
-         pixmap = gtk_pixmap_new((gpointer) icon, mask);
-         gtk_widget_show(pixmap);

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