[Pkg-wmaker-commits] [wmshutdown] 102/173: Delete debian/patches and update Homepage field in debian/control.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 02:46:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmshutdown.
commit 7e40bb631c66e3508d6d86a83ea357cd9251705b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sat Jul 26 10:14:01 2014 -0500
Delete debian/patches and update Homepage field in debian/control.
---
debian/control | 2 +-
debian/patches/10-makefile.patch | 68 ---------------
debian/patches/20-name-change.patch | 44 ----------
.../20-name-change=my.21-compile-fixes.patch | 99 ----------------------
debian/patches/30-clang_ftbfs_Wreturn-type.patch | 19 -----
debian/patches/series | 4 -
6 files changed, 1 insertion(+), 235 deletions(-)
diff --git a/debian/control b/debian/control
index b0dc1a9..32cb404 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Jari Aalto <jari.aalto at cante.net>
Build-Depends: debhelper (>= 9), libgtk2.0-dev
Standards-Version: 3.9.5
-Homepage: http://www.rafaelaroca.hpg.ig.com.br/bin
+Homepage: http://wmshutdown.sourceforge.net
Vcs-Browser: https://github.com/d-torrance/wmshutdown
Vcs-Git: https://github.com/d-torrance/wmshutdown.git
diff --git a/debian/patches/10-makefile.patch b/debian/patches/10-makefile.patch
deleted file mode 100644
index 1360dc3..0000000
--- a/debian/patches/10-makefile.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 6770107f24a14e944cd1c9c097db416f58431036 Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Thu, 17 Dec 2009 14:20:10 +0200
-Subject: [PATCH] Makefile: Change name. Fix linking with GTK+
-
-Also use CFLAGS, CPPFLAGS, LDFLAGS from the environment. Necessary to use
-(hardening) compiler flags specified by dh.
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
- Makefile | 32 ++++++++++++++++++++------------
- 1 files changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 219e871..678fda4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,15 @@
--all:
-+
-+LDFLAGS += -Wl,--no-add-needed -Wl,--no-undefined
-+INCFLAGS = -I/usr/include/gtk-2.0
-+LIBS = -lX11
-+
-+# The listing "pkg-config --libs gtk+-2.0" can be trimmed down to needed libs
-+GTKLIBS = $(shell perl -e' print join qq( ), grep /(-x11|gobject|glib)/, @ARGV' -- $$(pkg-config --libs gtk+-2.0) )
-+GTKFLAGS = `pkg-config --cflags gtk+-2.0`
-+
-+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 +19,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) $(CFLAGS) $(CPPFLAGS) $(INCFLAGS) $(GTKFLAGS) -c -o wmShutdown.o wmShutdown.c
-+ $(CC) $(LDFLAGS) -o wmShutdown wmShutdown.o $(GTKLIBS) $(LIBS)
-
- shutdown: shutdown.c
-- $(CC) -o Shutdown shutdown.c
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(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
deleted file mode 100644
index 7024be4..0000000
--- a/debian/patches/20-name-change.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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/20-name-change=my.21-compile-fixes.patch b/debian/patches/20-name-change=my.21-compile-fixes.patch
deleted file mode 100644
index b0a27bb..0000000
--- a/debian/patches/20-name-change=my.21-compile-fixes.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From b82ed2871a01bd1842f11ef64773e07c7a1f41f9 Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Thu, 17 Dec 2009 12:30:57 +0200
-Subject: [PATCH] Fix cast to pointer from integer warnings
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
- shutdown.c | 20 ++++++++++----------
- wmShutdown.c | 20 ++++++++++----------
- 2 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/shutdown.c b/shutdown.c
-index 857c410..91aec34 100644
---- a/shutdown.c
-+++ b/shutdown.c
-@@ -14,29 +14,29 @@ int main(int argc, char **argv) {
- if (argv[1] != NULL) {
-
- if (strcmp((char*)argv[1], "-r") == 0) {
-- char *teste;
-+ int ch;
- FILE *output;
-
- printf("Rebooting...\n");
- output = popen("/sbin/shutdown now -r", "r");
-- teste = (char*) fgetc(output);
-- while ((int)teste != EOF) {
-- printf("%c", teste);
-- teste = (char*) fgetc(output);
-+ ch = fgetc(output);
-+ while (ch != EOF) {
-+ printf("%c", ch);
-+ ch = fgetc(output);
- }
- pclose(output);
- }
-
- if (strcmp(argv[1], "-h") == 0) {
-- char *teste;
-+ int ch;
- FILE *output;
-
- printf("Halting...\n");
- output = popen("/sbin/shutdown now -h", "r");
-- teste = (char*) fgetc(output);
-- while ((int)teste != EOF) {
-- printf("%c", teste);
-- teste = (char*) fgetc(output);
-+ ch = fgetc(output);
-+ while (ch != EOF) {
-+ printf("%c", ch);
-+ ch = fgetc(output);
- }
- pclose(output);
- }
-diff --git a/wmShutdown.c b/wmShutdown.c
-index f03f4b9..a019025 100644
---- a/wmShutdown.c
-+++ b/wmShutdown.c
-@@ -55,26 +55,26 @@ int fecha(void) {
-
- int desliga(void) {
- FILE *output;
-- char *teste;
-+ int ch;
-
- output = popen("/usr/bin/wmshutdown -h", "r");
-- teste = (char*) fgetc(output);
-- while ((int)teste != EOF) {
-- g_print("%c", teste);
-- teste = (char*) fgetc(output);
-+ ch = fgetc(output);
-+ while (ch != EOF) {
-+ g_print("%c", ch);
-+ ch = fgetc(output);
- }
- pclose(output);
- }
-
- int reinicia(void) {
- FILE *output;
-- char *teste;
-+ int ch;
-
- output = popen("/usr/bin/wmshutdown-run -r", "r");
-- teste = (char*) fgetc(output);
-- while ((int)teste != EOF) {
-- g_print("%c", teste);
-- teste = (char*) fgetc(output);
-+ ch = fgetc(output);
-+ while (ch != EOF) {
-+ g_print("%c", ch);
-+ ch = fgetc(output);
- }
- pclose(output);
- }
---
-1.6.5
-
diff --git a/debian/patches/30-clang_ftbfs_Wreturn-type.patch b/debian/patches/30-clang_ftbfs_Wreturn-type.patch
deleted file mode 100644
index 2b9d95e..0000000
--- a/debian/patches/30-clang_ftbfs_Wreturn-type.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Non-void function should return a value.
- The function button_press should return an int, but was returning a void.
- This caused the build to fail when clang was used instead of gcc.
-Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
-Bug-Debian: http://bugs.debian.org/740964
-Reviewed-By: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: <2014-07-23>
-
---- wmshutdown-0.2.orig/wmShutdown.c
-+++ wmshutdown-0.2/wmShutdown.c
-@@ -98,7 +98,7 @@ int button_press(GtkWidget *widget, GdkE
- case 1:
-
- if (dialog != NULL)
-- return;
-+ return 1;
- message = "Shutdown confirmation";
- dialog = gtk_dialog_new();
- label = gtk_label_new (message);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5c41517..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-10-makefile.patch
-20-name-change.patch
-20-name-change=my.21-compile-fixes.patch
-30-clang_ftbfs_Wreturn-type.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmshutdown.git
More information about the Pkg-wmaker-commits
mailing list