r13888 - in packages/trunk/pianobooster/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2012-12-04 00:18:46 +0000 (Tue, 04 Dec 2012)
New Revision: 13888

Modified:
   packages/trunk/pianobooster/debian/changelog
   packages/trunk/pianobooster/debian/patches/linker_opts.patch
   packages/trunk/pianobooster/debian/pianobooster.desktop
Log:
Acknowledge previous NMU



Modified: packages/trunk/pianobooster/debian/changelog
===================================================================
--- packages/trunk/pianobooster/debian/changelog	2012-12-04 00:12:35 UTC (rev 13887)
+++ packages/trunk/pianobooster/debian/changelog	2012-12-04 00:18:46 UTC (rev 13888)
@@ -17,6 +17,14 @@
 
  -- Miriam Ruiz <miriam at debian.org>  Tue, 04 Dec 2012 00:44:18 +0100
 
+pianobooster (0.6.4-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch to set linker flag -mwindows only on
+    Windows. (Closes: #667322)
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 23 May 2012 18:13:25 +0200
+
 pianobooster (0.6.4-3) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/pianobooster/debian/patches/linker_opts.patch
===================================================================
--- packages/trunk/pianobooster/debian/patches/linker_opts.patch	2012-12-04 00:12:35 UTC (rev 13887)
+++ packages/trunk/pianobooster/debian/patches/linker_opts.patch	2012-12-04 00:18:46 UTC (rev 13888)
@@ -1,15 +1,20 @@
-Index: pianobooster-src-0.6.4b/src/CMakeLists.txt
-===================================================================
---- pianobooster-src-0.6.4b.orig/src/CMakeLists.txt	2009-11-27 22:25:35.000000000 +0100
-+++ pianobooster-src-0.6.4b/src/CMakeLists.txt	2012-12-04 01:04:12.000000000 +0100
-@@ -203,7 +203,9 @@
+Description: this is not windows
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/667322
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-05-23
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -201,9 +201,9 @@
+     ADD_EXECUTABLE( pianobooster WIN32 pianobooster.rc ${PIANOBOOSTER_SRCS}
+         ${PIANOBOOSTER_MOC_SRCS} ${PIANOBOOSTER_RC_SRCS}
          ${PIANOBOOSTER_UI_HDRS} )
++    SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
  ENDIF(WIN32)
  
 -SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
-+IF(WIN32)
-+    SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
-+ENDIF(WIN32)
  
  IF (USE_PCH)
  ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )

Modified: packages/trunk/pianobooster/debian/pianobooster.desktop
===================================================================
--- packages/trunk/pianobooster/debian/pianobooster.desktop	2012-12-04 00:12:35 UTC (rev 13887)
+++ packages/trunk/pianobooster/debian/pianobooster.desktop	2012-12-04 00:18:46 UTC (rev 13888)
@@ -11,4 +11,4 @@
 Exec=pianobooster
 Terminal=false
 MimeType=audio/x-karaoke;audio/x-midi;audio/midi;
-Categories=Audio;AudioVideo;Midi;Music;Player;Education;Qt;
+Categories=Audio;AudioVideo;Midi;Music;Player;Education;Qt