tags 672089 + patch
tags 672089 + pending
thanks

Dear maintainer,

I've prepared an NMU for icewm (versioned as 1.3.7-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Featuring The Dubliners, The Fureys And Davey Arthur Etc.: Molly 
Malone, The Band Of
diff -Nru icewm-1.3.7/debian/changelog icewm-1.3.7/debian/changelog
--- icewm-1.3.7/debian/changelog	2012-01-16 19:37:40.000000000 +0100
+++ icewm-1.3.7/debian/changelog	2012-05-22 17:46:30.000000000 +0200
@@ -1,3 +1,13 @@
+icewm (1.3.7-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: Xlib.h:1694:1: error: 'deprecated' was not declared in
+    this scope": add patch from Ubuntu / Andreas Moog:
+    - Don't define "deprecated", use "_ICEWM_deprecated" instead (LP: #935179)
+    (Closes: #672089)
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 22 May 2012 17:45:55 +0200
+
 icewm (1.3.7-2) unstable; urgency=low
 
   * ignore_workarea_hints patch (based on patch from SF task 3471908,
diff -Nru icewm-1.3.7/debian/patches/series icewm-1.3.7/debian/patches/series
--- icewm-1.3.7/debian/patches/series	2012-01-16 16:23:44.000000000 +0100
+++ icewm-1.3.7/debian/patches/series	2012-05-22 17:45:00.000000000 +0200
@@ -10,3 +10,4 @@
 do_not_send_configurenotify
 # wmswitch # needing to resolve modal focus problems before using it
 fuzzy_timers
+use_ICEWM_deprecated.patch
diff -Nru icewm-1.3.7/debian/patches/use_ICEWM_deprecated.patch icewm-1.3.7/debian/patches/use_ICEWM_deprecated.patch
--- icewm-1.3.7/debian/patches/use_ICEWM_deprecated.patch	1970-01-01 01:00:00.000000000 +0100
+++ icewm-1.3.7/debian/patches/use_ICEWM_deprecated.patch	2012-05-22 17:45:51.000000000 +0200
@@ -0,0 +1,19 @@
+Description: When defining deprecated, build against newer Xorg fails.
+Author: Andreas Moog <am...@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
+Bug-Debian: http://bugs.debian.org/672089
+
+--- icewm-1.3.7.orig/src/base.h
++++ icewm-1.3.7/src/base.h
+@@ -2,9 +2,9 @@
+ #define __BASE_H
+ 
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+-#define deprecated __attribute__((deprecated))
++#define _ICEWM_deprecated __attribute__((deprecated))
+ #else
+-#define deprecated
++#define _ICEWM_deprecated
+ #endif
+ 
+ /*** Atomar Data Types ********************************************************/

Attachment: signature.asc
Description: Digital signature

Reply via email to