← Back to branch summary

~cmiller/ubuntu/trusty/icewm/translations-cause-crash-lp447883

« back to all changes in this revision

Viewing changes to debian/patches/package_build_fixes.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Eduard Bloch
  • Date: 2008-03-10 21:24:25 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080310212425-562btgm3vbwzvhu0
Tags: 1.2.35-1
http://bugs.debian.org/360060
http://bugs.debian.org/319191
http://bugs.debian.org/349952
http://bugs.debian.org/456463
http://bugs.debian.org/428566
http://bugs.debian.org/389919
http://bugs.debian.org/459181
* New upstream release with one fix from CVS
* Automatic linking with gcc -lsupc++ fixed (failed in recent versions),
  also using "-Wl,--as-needed"
* Documentation update - README.Debian reordered by importance
* Changed font defaults in Xft specifications to consider Bitstream Vera
  family as alternative font (closes: #360060, #319191, #349952, #456463),
  also documented how to configure alternative fonts
* Added Bernhard's iconify_on_wm_hints as dpatch (closes: #428566, #389919)
* force use of bash in upstream's Makefile to keep the installation
  magic as-is (closes: #459181)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/package_build_fixes.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## build_fixes.dpatch by Eduard Bloch <blade@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad icewm-1.2.35~/src/wmmgr.cc icewm-1.2.35/src/wmmgr.cc
 
9
--- icewm-1.2.35~/src/wmmgr.cc  2008-01-05 08:34:24.000000000 +0100
 
10
+++ icewm-1.2.35/src/wmmgr.cc   2008-02-02 12:46:22.000000000 +0100
 
11
@@ -676,9 +676,11 @@
 
12
         case ICEWM_ACTION_WINDOWLIST:
 
13
             wmapp->actionPerformed(actionWindowList, 0);
 
14
             break;
 
15
+#ifndef LITE
 
16
         case ICEWM_ACTION_ABOUT:
 
17
             wmapp->actionPerformed(actionAbout, 0);
 
18
             break;
 
19
+#endif
 
20
         }
 
21
     }
 
22
 }