r10017 - in packages/trunk/performous/debian: . patches

Miriam Ruiz miriam at alioth.debian.org
Sat Jul 11 22:37:54 UTC 2009 

Author: miriam
Date: 2009-07-11 22:37:54 +0000 (Sat, 11 Jul 2009)
New Revision: 10017

Added:
   packages/trunk/performous/debian/patches/tools_names.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/boost_fix.patch
   packages/trunk/performous/debian/patches/datadirs.patch
   packages/trunk/performous/debian/patches/desktop.patch
   packages/trunk/performous/debian/patches/series
   packages/trunk/performous/debian/rules
Log:
Put tools in their very own package



Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/changelog	2009-07-11 22:37:54 UTC (rev 10017)
@@ -2,7 +2,9 @@
 
   [ Miriam Ruiz ]
   * New upstream release
+  * Added binary packages performous-tools and performous-tools-dbg
   * Updated patches
+  * Upgraded Standards-Version to 3.8.2
   * New build dependency: libglew1.5-dev
   * It depends on cmake (>= 2.6) now
 

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/control	2009-07-11 22:37:54 UTC (rev 10017)
@@ -12,7 +12,7 @@
  libmagick++9-dev, libsamplerate0-dev, libxml++2.6-dev,
  libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
  libgstreamer0.10-dev, libglew1.5-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ultrastar-ng/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ultrastar-ng/?op=log
 Homepage: http://performous.org/
@@ -34,7 +34,7 @@
 Section: debug
 Architecture: any
 Depends: performous (= ${binary:Version})
-Description: karaoke game that allows user supplied songs
+Description: karaoke game that allows user supplied songs - debug
  Performous is a karaoke program which is based off and looks similar to
  the Singstar game for PS2. Performous is based on UltraStar and allows
  you to add your own songs in MP3 format, along with a song text
@@ -42,6 +42,31 @@
  .
  This package includes the debugging symbols.
 
+Package: performous-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: performous
+Description: karaoke game that allows user supplied songs - tools
+ Performous is a karaoke program which is based off and looks similar to
+ the Singstar game for PS2. Performous is based on UltraStar and allows
+ you to add your own songs in MP3 format, along with a song text
+ and a music video file. It was previously called UltraStar NG.
+ .
+ This package includes some tools for converting original Singstar DVDs to
+ the format used by Performous.
+
+Package: performous-tools-dbg
+Section: debug
+Architecture: any
+Depends: performous-tools (= ${binary:Version})
+Description: karaoke game that allows user supplied songs - tools debug
+ Performous is a karaoke program which is based off and looks similar to
+ the Singstar game for PS2. Performous is based on UltraStar and allows
+ you to add your own songs in MP3 format, along with a song text
+ and a music video file. It was previously called UltraStar NG.
+ .
+ This package includes the debugging symbols for the tools.
+
 Package: ultrastar-ng
 Architecture: all
 Depends: performous

Modified: packages/trunk/performous/debian/patches/boost_fix.patch
===================================================================
--- packages/trunk/performous/debian/patches/boost_fix.patch	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/patches/boost_fix.patch	2009-07-11 22:37:54 UTC (rev 10017)
@@ -1,3 +1,6 @@
+# Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
 --- Performous-0.3.1-Source.orig/libs/libda/plugins/audio_dev_tone.cpp
 +++ Performous-0.3.1-Source/libs/libda/plugins/audio_dev_tone.cpp
 @@ -3,7 +3,7 @@

Modified: packages/trunk/performous/debian/patches/datadirs.patch
===================================================================
--- packages/trunk/performous/debian/patches/datadirs.patch	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/patches/datadirs.patch	2009-07-11 22:37:54 UTC (rev 10017)
@@ -1,3 +1,6 @@
+# Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
 --- Performous-0.3.1-Source.orig/data/performous.xml
 +++ Performous-0.3.1-Source/data/performous.xml
 @@ -185,7 +185,6 @@

Modified: packages/trunk/performous/debian/patches/desktop.patch
===================================================================
--- packages/trunk/performous/debian/patches/desktop.patch	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/patches/desktop.patch	2009-07-11 22:37:54 UTC (rev 10017)
@@ -1,3 +1,6 @@
+# Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
 --- Performous-0.3.1-Source.orig/data/performous.desktop
 +++ Performous-0.3.1-Source/data/performous.desktop
 @@ -8,7 +8,7 @@

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/patches/series	2009-07-11 22:37:54 UTC (rev 10017)
@@ -2,3 +2,4 @@
 boost_fix.patch
 gcc_44.patch
 datadirs.patch
+tools_names.patch

Added: packages/trunk/performous/debian/patches/tools_names.patch
===================================================================
--- packages/trunk/performous/debian/patches/tools_names.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/tools_names.patch	2009-07-11 22:37:54 UTC (rev 10017)
@@ -0,0 +1,53 @@
+# Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
+--- Performous-0.3.1-Source.orig/tools/CMakeLists.txt
++++ Performous-0.3.1-Source/tools/CMakeLists.txt
+@@ -37,25 +37,25 @@
+ 	endif (Boost_FOUND)
+ 
+     if (Magick++_FOUND)
+-        add_executable(cover_conv cover_conv.cpp pak.cpp)
+-        target_link_libraries(cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES})
+-		set(targets ${targets} cover_conv)
++        add_executable(ss_cover_conv cover_conv.cpp pak.cpp)
++        target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES})
++		set(targets ${targets} ss_cover_conv)
+     else (Magick++_FOUND)
+-        message("No Magick++ found, not building cover_conv")
++        message("No Magick++ found, not building ss_cover_conv")
+     endif (Magick++_FOUND)
+ else (LibXML++_FOUND)
+-    message("No LibXML++ found, not building ss_extract nor cover_conv")
++    message("No LibXML++ found, not building ss_extract nor ss_cover_conv")
+ endif (LibXML++_FOUND)
+ 
+ if (Boost_FOUND)
+-	add_executable(pak_extract pak_extract.cpp pak.cpp)
+-	target_link_libraries(pak_extract ${Boost_LIBRARIES})
++	add_executable(ss_pak_extract pak_extract.cpp pak.cpp)
++	target_link_libraries(ss_pak_extract ${Boost_LIBRARIES})
+ endif (Boost_FOUND)
+ 
+-add_executable(adpcm_decode adpcm_decode.cpp pak.cpp)
+-add_executable(ipu_decode ipu_decode.cpp)
+-add_executable(ipu_conv ipu_conv.cpp ipuconvmain.cpp pak.cpp)
+-set(targets ${targets} pak_extract adpcm_decode ipu_decode ipu_conv)
++add_executable(ss_adpcm_decode adpcm_decode.cpp pak.cpp)
++add_executable(ss_ipu_decode ipu_decode.cpp)
++add_executable(ss_ipu_conv ipu_conv.cpp ipuconvmain.cpp pak.cpp)
++set(targets ${targets} ss_pak_extract ss_adpcm_decode ss_ipu_decode ss_ipu_conv)
+ 
+ # add install target:
+ install(TARGETS ${targets} DESTINATION bin)
+--- Performous-0.3.1-Source.orig/tools/ss_extract.cpp
++++ Performous-0.3.1-Source/tools/ss_extract.cpp
+@@ -283,7 +283,7 @@
+ 			txtfile.close();
+ 			std::cerr << ">>> Extracting cover image" << std::endl;
+ 			// FIXME: use internally instead of separate program
+-			std::system(("cover_conv \"" + dvdPath + "/pack_ee.pak\" " + id + " \"" + path.string() + "/cover.jpg\"").c_str());
++			std::system(("ss_cover_conv \"" + dvdPath + "/pack_ee.pak\" " + id + " \"" + path.string() + "/cover.jpg\"").c_str());
+ 			remove = "";
+ 			if (video) {
+ 				std::cerr << ">>> Extracting video" << std::endl;

Modified: packages/trunk/performous/debian/rules
===================================================================
--- packages/trunk/performous/debian/rules	2009-07-11 18:22:53 UTC (rev 10016)
+++ packages/trunk/performous/debian/rules	2009-07-11 22:37:54 UTC (rev 10017)
@@ -14,6 +14,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	
 	# Perform an out-of-tree build to keep a clean source tree
+	rm -rf $(BUILD_TREE)
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake .. \
 		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
@@ -48,6 +49,17 @@
 	mkdir -p  $(CURDIR)/debian/performous/usr/share/games/ultrastar/songs
 	mv $(CURDIR)/debian/performous/usr/bin $(CURDIR)/debian/performous/usr/games
 
+	# Remove development stuff
+	rm -rf $(CURDIR)/debian/performous/usr/include
+	rm -rf $(CURDIR)/debian/performous/usr/lib/*.a
+
+	# Move tools to their own package
+	mkdir -p $(CURDIR)/debian/performous-tools/usr/games
+	cd $(CURDIR)/debian/performous/usr/games/ && \
+		for i in adpcm_decode cover_conv ipu_conv ipu_decode pak_extract ss_extract; do \
+		mv $(CURDIR)/debian/performous/usr/games/"$$i" $(CURDIR)/debian/performous-tools/usr/games/ ; \
+		done
+
 # Build architecture independant packages using the common target.
 binary-indep: 
 	dh_testdir
@@ -73,7 +85,8 @@
 	dh_install -a
 	dh_icons -a
 	dh_link -a
-	dh_strip --dbg-package=performous-dbg
+	dh_strip -pperformous --dbg-package=performous-dbg
+	dh_strip -pperformous-tools --dbg-package=performous-tools-dbg
 	dh_compress -a 
 	dh_fixperms -a
 	dh_makeshlibs -a

More information about the Pkg-games-commits mailing list