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

Miriam Ruiz miriam at alioth.debian.org
Tue Nov 11 20:51:18 UTC 2008


Author: miriam
Date: 2008-11-11 20:51:18 +0000 (Tue, 11 Nov 2008)
New Revision: 8381

Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/series
   packages/trunk/performous/debian/rules
Log:
Started fixing stuff... still a lot to do



Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2008-11-11 18:52:59 UTC (rev 8380)
+++ packages/trunk/performous/debian/changelog	2008-11-11 20:51:18 UTC (rev 8381)
@@ -1,3 +1,13 @@
+performous (0.3.0-1) UNRELEASED; urgency=low
+
+  * UltraStar NG is now called Performous. Package renamed to performous.
+  * New homepage: http://performous.org/
+  * New building system: cmake
+  * Updated build dependencies
+  * Removed ultrastar-ng-xine and ultrastar-ng-gstreamer packages.
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Tue, 11 Nov 2008 21:11:40 +0100
+
 ultrastar-ng (0.2.1-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2008-11-11 18:52:59 UTC (rev 8380)
+++ packages/trunk/performous/debian/control	2008-11-11 20:51:18 UTC (rev 8381)
@@ -1,52 +1,26 @@
-Source: ultrastar-ng
+Source: performous
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake1.10 | automake1.9, libtool, quilt,
- libsdl1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libcairo2-dev (>= 1.2), librsvg2-dev,
- libsmpeg-dev, libfftw3-dev, libasound2-dev, libgstreamer0.10-dev, libxine-dev,
- libboost-dev, libboost-thread-dev, libboost-serialization-dev,
- libboost-program-options-dev, libboost-regex-dev,
- portaudio19-dev | portaudio-dev, libxml2-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.51), cmake (>= 2.4), quilt, help2man, 
+ libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev,
+ libboost-thread-dev, libboost-serialization-dev, libboost-program-options-dev,
+ libboost-regex-dev, libboost-filesystem-dev,
+ libavcodec-dev, libavformat-dev, libswscale-dev,
+ libmagick++9-dev, libsamplerate0-dev, libxml++2.6-dev,
+ libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
+ libgstreamer0.10-dev
+Standards-Version: 3.8.0
 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://ultrastar-ng.sourceforge.net/
+Homepage: http://performous.org/
 
-Package: ultrastar-ng
+Package: performous
 Architecture: all
-Depends: ultrastar-ng-gstreamer | ultrastar-ng-xine
-Description: karaoke game that allows user supplied songs
- Karaoke program which is based off and looks similar to Singstar for
- PS2. UltraStar-NG is based on UltraStar and allows you to add your
- own songs in the forms of mp3s along with a song text and a music video
- file.
- .
- This is a void package that installs the default version of the program.
-
-Package: ultrastar-ng-gstreamer
-Provides: ultrastar-ng
-Conflicts: ultrastar-ng-xine
-Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: karaoke game that allows user supplied songs
- Karaoke program which is based off and looks similar to Singstar for
- PS2. UltraStar-NG is based on UltraStar and allows you to add your
- own songs in the forms of mp3s along with a song text and a music video 
- file.
- .
- This package includes the game compiled against GStreamer.
-
-Package: ultrastar-ng-xine
-Provides: ultrastar-ng
-Conflicts: ultrastar-ng-gstreamer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: karaoke game that allows user supplied songs
- Karaoke program which is based off and looks similar to Singstar for
- PS2. UltraStar-NG is based on UltraStar and allows you to add your
- own songs in the forms of mp3s along with a song text and a music video 
- file.
- .
- This package includes the game compiled against xine.
+ 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 the forms of mp3s along with a song text and a music video
+ file. It was previously called UltraStar NG.

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2008-11-11 18:52:59 UTC (rev 8380)
+++ packages/trunk/performous/debian/patches/series	2008-11-11 20:51:18 UTC (rev 8381)
@@ -1,2 +0,0 @@
-exclude_docs.patch
-desktop.patch

Modified: packages/trunk/performous/debian/rules
===================================================================
--- packages/trunk/performous/debian/rules	2008-11-11 18:52:59 UTC (rev 8380)
+++ packages/trunk/performous/debian/rules	2008-11-11 20:51:18 UTC (rev 8381)
@@ -3,172 +3,82 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
-CFLAGS = -Wall -g
+BUILD_TREE=$(CURDIR)/build-tree
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config-common: config-common-stamp
-config-common-stamp:
-	# TARGET: $@
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	printf "\nReconfiguring autotools\n\n"
-	autoreconf --verbose --force --install
-	printf "\n"
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	
+	# Perform an out-of-tree build to keep a clean source tree
+	mkdir $(BUILD_TREE)
+	cd $(BUILD_TREE); cmake .. \
+		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
+		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" 
 	touch $@
 
-config-gstreamer-librsvg: config-gstreamer-librsvg-stamp
-config-gstreamer-librsvg-stamp: config-common
-	# TARGET: $@
+build: build-stamp
+build-stamp: configure-stamp 
 	dh_testdir
-	printf "\nConfiguring gstreamer-librsvg\n\n"
-	mkdir -p tmp-gst-smpeg-rsvg;
-	cd tmp-gst-smpeg-rsvg && "../configure" \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \
-	--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-        --libdir=\$${prefix}/lib/ultrastar-ng --enable-shared --disable-static \
-	--with-audio=gstreamer --with-video=smpeg --with-svg=librsvg \
-	--enable-record-alsa \
-	CFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" CPPFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" \
-	LDFLAGS="-Wl,-z,defs -Wl,-as-needed -Wl,--rpath,/usr/lib/ultrastar-ng"
-	printf "\n"
+	cd $(BUILD_TREE); $(MAKE)
 	touch $@
 
-build-gstreamer-librsvg: build-gstreamer-librsvg-stamp
-build-gstreamer-librsvg-stamp: config-gstreamer-librsvg
-	# TARGET: $@
-	dh_testdir
-	printf "\nBuilding gstreamer-librsvg\n\n"
-	cd tmp-gst-smpeg-rsvg; $(MAKE)
-	printf "\n"
-	touch $@
-
-config-xine-librsvg: config-xine-librsvg-stamp
-config-xine-librsvg-stamp: config-common
-	# TARGET: $@
-	dh_testdir
-	printf "\nConfiguring xine-librsvg\n\n"
-	mkdir -p tmp-xine-smpeg-rsvg;
-	cd tmp-xine-smpeg-rsvg && "../configure" \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \
-	--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-        --libdir=\$${prefix}/lib/ultrastar-ng --enable-shared --disable-static \  
-	--with-audio=xine --with-video=smpeg --with-svg=librsvg \
-        --enable-record-alsa \
-	CFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" CPPFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" \
-	LDFLAGS="-Wl,-z,defs -Wl,-as-needed -Wl,--rpath,/usr/lib/ultrastar-ng"
-	printf "\n"
-	touch $@
-
-build-xine-librsvg: build-xine-librsvg-stamp
-build-xine-librsvg-stamp: config-xine-librsvg
-	# TARGET: $@
-	dh_testdir
-	printf "\nBuilding xine-librsvg\n\n"
-	cd tmp-xine-smpeg-rsvg; $(MAKE)
-	printf "\n"
-	touch $@
-
-config: config-common config-gstreamer-librsvg config-xine-librsvg
-
-build: build-stamp
-build-stamp: config build-gstreamer-librsvg build-xine-librsvg
-	# TARGET: $@
-	#docbook-to-man debian/ultrastar-ng.sgml > ultrastar-ng.1
-	touch $@
-
 clean:
-	# TARGET: $@
 	dh_testdir
 	dh_testroot
-	rm -f *-stamp
-	rm -rf tmp-gst-smpeg-rsvg
-	rm -rf tmp-xine-smpeg-rsvg
-	rm -rf tmp-*
-	rm -f config.guess config.sub config.log
-	rm -f configure install-sh depcomp INSTALL "config.h.in:config.h.incl"
-	rm -f Makefile.in themes/Makefile.in aclocal.m4 missing \
-		data/Makefile.in docs/Makefile.in src/Makefile.in
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -f build-stamp configure-stamp
+	if [ -d $(BUILD_TREE) ]; then cd $(BUILD_TREE); $(MAKE) clean; fi
+	rm -fr $(BUILD_TREE)
+	rm -fr .pc
 	dh_clean 
 
 install: build
-	# TARGET: $@
 	dh_testdir
 	dh_testroot
-	dh_clean -a -k 
+	dh_clean -k
 	dh_installdirs
+	cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	printf "\nInstalling gstreamer-librsvg\n\n"
-	cd tmp-gst-smpeg-rsvg; $(MAKE) install DESTDIR=$(CURDIR)/debian/ultrastar-ng-gstreamer
-	printf "\n"
-
-	printf "\nInstalling xine-librsvg\n\n"
-	cd tmp-xine-smpeg-rsvg; $(MAKE) install DESTDIR=$(CURDIR)/debian/ultrastar-ng-xine
-	printf "\n"
-
-# Build architecture-independent files here.
-binary-indep:
-	# TARGET: $@
-	dh_testdir
-	dh_testroot
+# Build architecture independant packages using the common target.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
 	dh_installchangelogs -i
 	dh_installdocs -i
+	dh_install -i
 	dh_link -i
-	dh_compress -i
+	dh_compress  -i
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: install
-	# TARGET: $@
-	dh_testdir
-	dh_testroot
-	#dh_installdirs -a usr/share/doc/ultrastar-ng
-	#dh_link -pultrastar-ng-gstreamer usr/share/doc/ultrastar-ng usr/share/doc/ultrastar-ng-gstreamer
-	#dh_link -pultrastar-ng-xine usr/share/doc/ultrastar-ng usr/share/doc/ultrastar-ng-xine
-	dh_installchangelogs -a ChangeLog
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a
 	dh_installdocs -a
-	dh_installexamples -a
-#	dh_install -a
-	dh_install -pultrastar-ng-gstreamer debian/ultrastar-ng-64px.xpm usr/share/pixmaps
-	dh_desktop -pultrastar-ng-gstreamer -A debian/ultrastar-ng.desktop
-	dh_install -pultrastar-ng-xine debian/ultrastar-ng-64px.xpm usr/share/pixmaps
-	dh_desktop -pultrastar-ng-xine -A debian/ultrastar-ng.desktop
 	dh_installmenu -a
-#	dh_installmime -a
 	dh_installman -a
+	dh_install -a
+	dh_desktop -a
+	dh_icons -a
 	dh_link -a
 	dh_strip -a
-	dh_compress -a
+	dh_compress  -a
 	dh_fixperms -a
+	dh_makeshlibs -a
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
-binary: binary-indep binary-arch
-.PHONY: config-common config-gstreamer-librsvg config-xine-librsvg
-.PHONY: build-gstreamer-librsvg build-xine-librsvg
-.PHONY: config build clean binary-indep binary-arch binary install 
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install configure




More information about the Pkg-games-commits mailing list