[Pkg-wmaker-commits] [wmshutdown] 51/173: debian/patches: add quilt

[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 ef19bc8059ecf5f46ceab58632bb558938a39f2c
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Thu Dec 17 12:03:04 2009 +0200

    debian/patches: add quilt
    
    Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
 debian/patches/10-makefile.patch    | 61 +++++++++++++++++++++++++++++++++++++
 debian/patches/20-name-change.patch | 44 ++++++++++++++++++++++++++
 debian/patches/series               |  2 ++
 3 files changed, 107 insertions(+)

diff --git a/debian/patches/10-makefile.patch b/debian/patches/10-makefile.patch
new file mode 100644
index 0000000..58b0895
--- /dev/null
+++ b/debian/patches/10-makefile.patch
@@ -0,0 +1,61 @@
+From 8037d93bbfa703e6d1a05563823e30f569ebbecf Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aalto at cante.net>
+Date: Sat, 5 Dec 2009 17:31:33 +0200
+Subject: [PATCH] Makefile: chnage name. Fix linking
+
+Signed-off-by: Jari Aalto <jari.aalto at cante.net>
+---
+ Makefile |   28 ++++++++++++++++------------
+ 1 files changed, 16 insertions(+), 12 deletions(-)
+
+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
+-- 
+1.6.5
+
diff --git a/debian/patches/20-name-change.patch b/debian/patches/20-name-change.patch
new file mode 100644
index 0000000..7024be4
--- /dev/null
+++ b/debian/patches/20-name-change.patch
@@ -0,0 +1,44 @@
+From 0eda3e6215b8b2fa09fe032861313d08a98bb490 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aalto at cante.net>
+Date: Tue, 8 Dec 2009 14:27:05 +0200
+Subject: [PATCH] wmShutdown.c: change names
+
+Signed-off-by: Jari Aalto <jari.aalto at cante.net>
+---
+ wmShutdown.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+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);
+-- 
+1.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a1a573d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-makefile.patch
+20-name-change.patch

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