Hello,

I'm doing an NMU of wmmisc to fix #332751; diff attached.

Thanks,

Matej
diff -u wmmisc-0.9/debian/changelog wmmisc-0.9/debian/changelog
--- wmmisc-0.9/debian/changelog
+++ wmmisc-0.9/debian/changelog
@@ -1,3 +1,13 @@
+wmmisc (0.9-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * src/wmgeneral.c (openXwindow): Don't call free() on argv[] data.
+    Thanks to Petr Gajdusek for the patch.  Closes: #332751.
+  * debian/patches/00list: Add.
+  * debian/rules: Fix dpatch rules.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Thu, 26 Jan 2006 16:24:52 +0100
+
 wmmisc (0.9-2) unstable; urgency=low
 
   * Removed -march=pentium3 from CFLAGS. (Closes: #274678)
diff -u wmmisc-0.9/debian/rules wmmisc-0.9/debian/rules
--- wmmisc-0.9/debian/rules
+++ wmmisc-0.9/debian/rules
@@ -28,12 +28,8 @@
        touch configure-stamp
 
 
-build: build-patch build-stamp
-
-build-patch:
-       dpatch apply src-Makefile.dpatch
-       dpatch apply src-generalmk.dpatch
-build-stamp: configure-stamp 
+build: build-stamp
+build-stamp: patch-stamp configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
@@ -42,7 +38,7 @@
 
        touch build-stamp
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
only in patch2:
unchanged:
--- wmmisc-0.9.orig/debian/patches/src-wmgeneral.dpatch
+++ wmmisc-0.9/debian/patches/src-wmgeneral.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## src-wmgeneral.dpatch by Petr Gajdusek <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't call free() on argv[] data.
+
[EMAIL PROTECTED]@
+diff -urNad wmmisc-0.9~/src/wmgeneral.c wmmisc-0.9/src/wmgeneral.c
+--- wmmisc-0.9~/src/wmgeneral.c        2004-04-20 03:36:31.000000000 +0200
++++ wmmisc-0.9/src/wmgeneral.c 2006-01-26 16:18:03.000000000 +0100
+@@ -394,10 +394,4 @@
+ 
+       XMoveWindow (display, win, wx, wy);
+     }
+-
+-  if (display_name != NULL)
+-    free (display_name);
+-
+-  if (wname != NULL)
+-    free (wname);
+ }
only in patch2:
unchanged:
--- wmmisc-0.9.orig/debian/patches/00list
+++ wmmisc-0.9/debian/patches/00list
@@ -0,0 +1,3 @@
+src-Makefile.dpatch
+src-generalmk.dpatch
+src-wmgeneral.dpatch

Reply via email to