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

Markus Koschany apo-guest at alioth.debian.org
Tue Jul 2 16:59:53 UTC 2013 

Author: apo-guest
Date: 2013-07-02 16:59:51 +0000 (Tue, 02 Jul 2013)
New Revision: 14401

Added:
   packages/trunk/pianobooster/debian/patches/link-pthread-and-GL-explicitly.patch
Modified:
   packages/trunk/pianobooster/debian/changelog
   packages/trunk/pianobooster/debian/control
   packages/trunk/pianobooster/debian/copyright
   packages/trunk/pianobooster/debian/patches/series
   packages/trunk/pianobooster/debian/pianobooster.desktop
   packages/trunk/pianobooster/debian/rules
   packages/trunk/pianobooster/debian/watch
Log:
Fix RC bug 713691. Release 0.6.4b-2.


Modified: packages/trunk/pianobooster/debian/changelog
===================================================================
--- packages/trunk/pianobooster/debian/changelog	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/changelog	2013-07-02 16:59:51 UTC (rev 14401)
@@ -1,3 +1,21 @@
+pianobooster (0.6.4b-2) unstable; urgency=low
+
+  * Team upload.
+  * Bump Standards-Version to 3.9.4, no changes.
+  * Use canonical VCS-URI.
+  * Remove quilt from Build-Depends because source format 3.0 uses quilt by
+    default.
+  * Remove superfluous substvar ${shlibs:Depends} from performous-dbg.
+  * Add link-pthread-and-GL-explicitly.patch and fix FTBFS by linking the
+    missing libraries in CMakelist.txt explicitly. (Closes: #713691)
+  * Fix lintian error and do not set the library RPATH in debian/rules anymore.
+    Use the normal library search path instead.
+  * Update debian/copyright to copyright format 1.0. Fix spelling mistakes.
+  * pianobooster.desktop: Add keywords.
+  * Update debian/watch.
+
+ -- Markus Koschany <apo at gambaru.de>  Tue, 02 Jul 2013 16:53:50 +0200
+
 pianobooster (0.6.4b-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/pianobooster/debian/control
===================================================================
--- packages/trunk/pianobooster/debian/control	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/control	2013-07-02 16:59:51 UTC (rev 14401)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <miriam at debian.org>
-Build-Depends: debhelper (>= 9), cmake, dh-buildinfo, quilt,
+Build-Depends: debhelper (>= 9), cmake, dh-buildinfo,
  qt4-qmake, libqt4-dev, libqt4-opengl-dev,
  mesa-common-dev, libglu1-mesa-dev, libasound2-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://pianobooster.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pianobooster/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pianobooster/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/pianobooster/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/pianobooster/
 
 Package: pianobooster
 Architecture: any
@@ -32,7 +32,7 @@
 Architecture: any
 Section: debug
 Priority: extra
-Depends: pianobooster (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: pianobooster (= ${binary:Version}), ${misc:Depends}
 Description: learn the piano just by playing a game - debug
  Piano Booster is a new way to learn the piano just by playing a game. 
  It takes elements of the game Guitar Hero but now it uses a real piano

Modified: packages/trunk/pianobooster/debian/copyright
===================================================================
--- packages/trunk/pianobooster/debian/copyright	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/copyright	2013-07-02 16:59:51 UTC (rev 14401)
@@ -1,16 +1,17 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Source: http://sourceforge.net/projects/pianobooster/
-Upstream-Maintainer: Louis J. Barman <louisjb at users.sourceforge.net>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://sourceforge.net/projects/pianobooster/
+Upstream-Contact: Louis J. Barman <louisjb at users.sourceforge.net>
+Upstream-Name: Piano Booster
 Debianized-By: Miriam Ruiz <little_miry at yahoo.es>
 Debianized-Date: Wed, 04 Mar 2009 02:22:56 +0100
 
 Files: *
 Copyright: Copyright (c) 2008-2009, L. J. Barman
-Licence: GPL-3+
+License: GPL-3+
 
 Files: src/rtmidi/RtMidi.cpp
 Copyright: Copyright (c) 2003-2011, Gary P. Scavone
-Licence:
+License:
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -36,16 +37,13 @@
 
 Files: debian/*
 Copyright: Copyright (C) 2009, Miriam Ruiz <little_miry at yahoo.es>
-Licence: GPL-3+
+License: GPL-3+
 
-Licence: GPL-3+
+License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
  .
- On Debian systems, the complete text of the latest version of the GNU
- General Public License can be found in `/usr/share/common-licenses/GPL'.
- .
  The complete text of version 3 of the GNU General Public License can be
  found in `/usr/share/common-licenses/GPL-3'.

Added: packages/trunk/pianobooster/debian/patches/link-pthread-and-GL-explicitly.patch
===================================================================
--- packages/trunk/pianobooster/debian/patches/link-pthread-and-GL-explicitly.patch	                        (rev 0)
+++ packages/trunk/pianobooster/debian/patches/link-pthread-and-GL-explicitly.patch	2013-07-02 16:59:51 UTC (rev 14401)
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 2 Jul 2013 10:23:08 +0000
+Subject: link pthread and GL explicitly
+
+Fixes FTBFS because of missing pthread and GL libraries.
+
+Bug: http://bugs.debian.org/713691
+Forwarded: http://sourceforge.net/p/pianobooster/patches/3/
+---
+ src/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index fb7465f..10c1867 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -57,6 +57,8 @@ IF(${CMAKE_SYSTEM} MATCHES "Linux")
+     #IF(ALSA_FOUND)
+         ADD_DEFINITIONS(-D__LINUX_ALSASEQ__)
+         LINK_LIBRARIES (asound)
++        LINK_LIBRARIES (pthread)
++        LINK_LIBRARIES (GL)
+     #ELSE(ALSA_FOUND)
+     #    MESSAGE(FATAL_ERROR "Please install the 'libasound2-dev' package and then try again")
+     #ENDIF(ALSA_FOUND)

Modified: packages/trunk/pianobooster/debian/patches/series
===================================================================
--- packages/trunk/pianobooster/debian/patches/series	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/patches/series	2013-07-02 16:59:51 UTC (rev 14401)
@@ -1,3 +1,4 @@
 rtmidi-1.0.15.patch
 i18n.patch
 gcc-4.7.patch
+link-pthread-and-GL-explicitly.patch

Modified: packages/trunk/pianobooster/debian/pianobooster.desktop
===================================================================
--- packages/trunk/pianobooster/debian/pianobooster.desktop	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/pianobooster.desktop	2013-07-02 16:59:51 UTC (rev 14401)
@@ -12,3 +12,4 @@
 Terminal=false
 MimeType=audio/x-karaoke;audio/x-midi;audio/midi;
 Categories=Audio;AudioVideo;Midi;Music;Player;Education;Qt
+Keywords=audio;midi;music;piano;education;learning;playing;songs;

Modified: packages/trunk/pianobooster/debian/rules
===================================================================
--- packages/trunk/pianobooster/debian/rules	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/rules	2013-07-02 16:59:51 UTC (rev 14401)
@@ -14,8 +14,6 @@
 config: config-stamp
 config-stamp: 
 	dh_testdir
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake $(CURDIR)/src/ \
@@ -27,8 +25,7 @@
 		-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS) $(CPPFLAGS)" \
 		-DBUILD_STATIC:BOOL=ON \
 		-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \
-		-DCMAKE_INSTALL_RPATH:STRING="/usr/lib/games/pianobooster"
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)"
 	touch $@
 
 build-stamp: config
@@ -49,7 +46,6 @@
 	rm -fv build-stamp config-stamp
 	rm -fvr $(BUILD_TREE)
 	rm -fv src/*.qm
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build
@@ -86,8 +82,6 @@
 
 refresh-tr:
 	dh_testdir
-	-quilt push -a
-	
 	# Update translations
 	cd $(CURDIR)/src/ && lupdate -verbose pianobooster.pro
 

Modified: packages/trunk/pianobooster/debian/watch
===================================================================
--- packages/trunk/pianobooster/debian/watch	2013-07-02 09:44:33 UTC (rev 14400)
+++ packages/trunk/pianobooster/debian/watch	2013-07-02 16:59:51 UTC (rev 14401)
@@ -4,5 +4,5 @@
 
 version=3
 
-opts="versionmangle=s/(.*)([A-Za-z])$/$1~$2/" \
-	http://sf.net/pianobooster/pianobooster-src-(.*)\.tar\.gz
+opts="versionmangle=s/(.*)([A-Za-z])$/$1$2/" \
+http://sf.net/pianobooster/pianobooster-src-(.*)\.tar\.gz

More information about the Pkg-games-commits mailing list