[Pkg-wmaker-commits] [wmacpi] 47/105: Imported Debian patch 2.1-6

[Doug Torrance]

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

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

commit 1b84bcce7b763f68503978b731860afd2e7bea20
Author: Sebastian Henschel <shensche at debian.org>
Date:   Tue Sep 26 13:42:52 2006 +1200

    Imported Debian patch 2.1-6
---
 Makefile         |  2 +-
 debian/changelog | 13 +++++++++++++
 debian/control   |  4 ++--
 debian/docs      |  1 +
 wmacpi.c         |  2 --
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4d53ae1..0707ebe 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ BUILD_CLI = 1
 
 CC	:= gcc
 CFLAGS	:= $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
-LDFLAGS := $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext -ldockapp
+LDFLAGS := $(OPT) -L/usr/X11R6/lib -lX11 -ldockapp
 
 WMSRC	:= wmacpi.c libacpi.c
 HEADERS := libacpi.h wmacpi.h
diff --git a/debian/changelog b/debian/changelog
index aad77cf..2cac4b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+wmacpi (2.1-6) unstable; urgency=low
+
+  * wmacpi.c:
+    - Slight modification of libdockapp0.6 patch.
+  * Makefile:
+    - Removed inclusion of libXext and libXpm as suggested at
+      http://rerun.lefant.net/checklib/log.wmacpi_2.1-5.html.
+  * debian/control
+    - Bumped Standards-Version to 3.7.2.0.
+    - Removed Build-Depends on libxext-dev and libxpm-dev.
+
+ -- Sebastian Henschel <shensche at debian.org>  Tue, 26 Sep 2006 13:42:52 +1200
 wmacpi (2.1-5) unstable; urgency=low
 
   * wmacpi.c:
@@ -6,6 +18,7 @@ wmacpi (2.1-5) unstable; urgency=low
 
  -- Sebastian Henschel <shensche at debian.org>  Thu,  2 Feb 2006 14:20:24 +0100
 
+
 wmacpi (2.1-4) unstable; urgency=low
 
   * wmacpi.c:
diff --git a/debian/control b/debian/control
index 66470c3..b7e4fce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wmacpi
 Section: x11
 Priority: extra
 Maintainer: Sebastian Henschel <shensche at debian.org>
-Build-Depends: debhelper (>= 4), libx11-dev, libxext-dev, libxpm-dev, x-dev, libdockapp-dev (>=1:0.5.0-1)
-Standards-Version: 3.6.2.0
+Build-Depends: debhelper (>= 4), libx11-dev, x-dev, libdockapp-dev (>=1:0.5.0-1)
+Standards-Version: 3.7.2.0
 
 Package: wmacpi
 Architecture: i386 amd64
diff --git a/debian/docs b/debian/docs
index 86e0ce2..4cbc1c5 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,4 @@
 README
 AUTHORS
 TODO
+
diff --git a/wmacpi.c b/wmacpi.c
index 8a0fd38..7644556 100644
--- a/wmacpi.c
+++ b/wmacpi.c
@@ -140,8 +140,6 @@ static void new_window(char *display, char *name, int argc, char **argv)
     char **fake_argv = malloc (sizeof(char) * 7);
     fake_argv[0] = "wmacpi";
     DAParseArguments(1, fake_argv, NULL, 0, "", WMACPI_VER);
-    free(fake_argv);
-
     DAInitialize(display, name, 64, 64, argc, argv);
     dockapp->display = DADisplay;
     dockapp->win = DAWindow;

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