Author: baby-guest Date: 2007-11-02 15:10:25 +0000 (Fri, 02 Nov 2007) New Revision: 4537
Removed: packages/trunk/ultrastar-ng/debian/patches/check_sdl_init.patch packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch Modified: packages/trunk/ultrastar-ng/debian/changelog packages/trunk/ultrastar-ng/debian/control packages/trunk/ultrastar-ng/debian/patches/exclude_docs.patch packages/trunk/ultrastar-ng/debian/patches/series packages/trunk/ultrastar-ng/debian/rules Log: New upstream release Modified: packages/trunk/ultrastar-ng/debian/changelog =================================================================== --- packages/trunk/ultrastar-ng/debian/changelog 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/changelog 2007-11-02 15:10:25 UTC (rev 4537) @@ -1,3 +1,18 @@ +ultrastar-ng (0.2.0-1) UNRELEASED; urgency=low + + [ Miriam Ruiz ] + * New Upstream Release + * Removed unneeded patches + * Added packages to build deps: + + libtool + + portaudio19-dev | portaudio-dev + + libboost-dev, libboost-thread-dev, libboost-serialization-dev + + libboost-program-options-dev, libboost-regex-dev + * Moved shared objects to private directory: /usr/lib/ultraster-ng + * Added rpath to binaries to search for shared objects in the private dir + + -- Miriam Ruiz <[EMAIL PROTECTED]> Fri, 02 Nov 2007 14:08:42 +0000 + ultrastar-ng (0.1.4-2) unstable; urgency=low [ Miriam Ruiz ] Modified: packages/trunk/ultrastar-ng/debian/control =================================================================== --- packages/trunk/ultrastar-ng/debian/control 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/control 2007-11-02 15:10:25 UTC (rev 4537) @@ -3,7 +3,12 @@ Priority: extra Maintainer: Debian Games Team <[EMAIL PROTECTED]> Uploaders: Miriam Ruiz <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake1.10 | automake1.9, quilt, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libcairo2-dev (>= 1.2), librsvg2-dev, libsmpeg-dev, fftw3-dev, libasound2-dev, libgstreamer0.10-dev, libxine-dev, libxml2-dev +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, fftw3-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.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ultrastar-ng/ XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ultrastar-ng/?op=log Deleted: packages/trunk/ultrastar-ng/debian/patches/check_sdl_init.patch =================================================================== --- packages/trunk/ultrastar-ng/debian/patches/check_sdl_init.patch 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/patches/check_sdl_init.patch 2007-11-02 15:10:25 UTC (rev 4537) @@ -1,20 +0,0 @@ -# Checks that the SDL screen has been properly initialized, or exits with an error - -# http://ultrastar-ng.cvs.sourceforge.net/ultrastar-ng/UltraStar-ng/src/main.cpp?r1=1.38&r2=1.39 -# See http://bugs.debian.org/427386 - ---- ultrastar-ng-0.1.4.orig/src/main.cpp -+++ ultrastar-ng-0.1.4/src/main.cpp -@@ -48,6 +48,12 @@ - - screenSDL = videoDriver->init( width, height, fullscreen ); - -+ if( screenSDL == NULL ) { -+ fprintf(stderr,"Cannot initialize screen\n"); -+ SDL_Quit(); -+ exit(EXIT_FAILURE); -+ } -+ - SDL_ShowCursor(SDL_DISABLE); - SDL_EnableUNICODE(SDL_ENABLE); - SDL_EnableKeyRepeat(125, 125); Modified: packages/trunk/ultrastar-ng/debian/patches/exclude_docs.patch =================================================================== --- packages/trunk/ultrastar-ng/debian/patches/exclude_docs.patch 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/patches/exclude_docs.patch 2007-11-02 15:10:25 UTC (rev 4537) @@ -1,18 +1,22 @@ ---- ultrastar-ng-0.1.4.orig/configure.in -+++ ultrastar-ng-0.1.4/configure.in -@@ -406,7 +406,6 @@ - AC_OUTPUT( +Index: ultrastar-ng-0.2.0/configure.in +=================================================================== +--- ultrastar-ng-0.2.0.orig/configure.in 2007-11-02 12:47:05.000000000 +0000 ++++ ultrastar-ng-0.2.0/configure.in 2007-11-02 14:22:48.000000000 +0000 +@@ -535,7 +535,6 @@ Makefile + audio/Makefile data/Makefile - docs/Makefile src/Makefile themes/Makefile ) ---- ultrastar-ng-0.1.4.orig/Makefile.am -+++ ultrastar-ng-0.1.4/Makefile.am +Index: ultrastar-ng-0.2.0/Makefile.am +=================================================================== +--- ultrastar-ng-0.2.0.orig/Makefile.am 2007-09-29 13:26:54.000000000 +0000 ++++ ultrastar-ng-0.2.0/Makefile.am 2007-11-02 14:23:07.000000000 +0000 @@ -1,4 +1,4 @@ --SUBDIRS = src docs data themes -+SUBDIRS = src data themes +-SUBDIRS = audio src docs data themes ++SUBDIRS = audio src data themes includes = include/audio.h \ include/video.h \ Modified: packages/trunk/ultrastar-ng/debian/patches/series =================================================================== --- packages/trunk/ultrastar-ng/debian/patches/series 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/patches/series 2007-11-02 15:10:25 UTC (rev 4537) @@ -1,4 +1 @@ exclude_docs.patch -xine_ogg.patch -check_sdl_init.patch -sing_screen.patch Deleted: packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch =================================================================== --- packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch 2007-11-02 15:10:25 UTC (rev 4537) @@ -1,35 +0,0 @@ -# Debian Bug Report #435383 -# If the background image is missing the singing screen shows the last available background image. -# This patch solves this bug -# http://ultrastar-ng.cvs.sourceforge.net/ultrastar-ng/UltraStar-ng/src/screen_sing.cpp?r1=1.70&r2=1.71&view=patch - ---- ultrastar-ng-0.1.4/src/screen_sing.cpp.orig 2007-08-01 08:08:18.000000000 +0000 -+++ ultrastar-ng-0.1.4/src/screen_sing.cpp 2007-08-01 08:08:33.000000000 +0000 -@@ -23,7 +23,6 @@ - screen->format->Bmask, - screen->format->Amask); - SDL_SetAlpha(videoSurf, SDL_SRCALPHA, SDL_ALPHA_OPAQUE); -- //SDL_FillRect(videoSurf,NULL,0xffffff); - backgroundSurf = SDL_AllocSurface( screen->flags, - sm->getWidth(), - sm->getHeight(), -@@ -54,16 +53,18 @@ - CScreenManager * sm = CScreenManager::getSingletonPtr(); - CSong * song = sm->getSong(); - -+ SDL_FillRect(backgroundSurf,NULL,SDL_MapRGB(backgroundSurf->format, 255, 255, 255)); - if( song->video != NULL ) { - snprintf(buff,1024,"%s/%s",song->path,song->video); - fprintf(stdout,"Now playing: (%d): %s\n",sm->getSongId(),buff); - video->loadVideo(buff,videoSurf,sm->getWidth(),sm->getHeight()); -+ SDL_BlitSurface(theme->bg->getSDLSurface(),NULL,backgroundSurf,NULL); -+ SDL_BlitSurface(theme->p1box->getSDLSurface(),NULL,backgroundSurf,NULL); - } else if ( song->background != NULL) { - SDL_BlitSurface(song->backgroundSurf,NULL,backgroundSurf,NULL); - SDL_BlitSurface(theme->bg->getSDLSurface(),NULL,backgroundSurf,NULL); - SDL_BlitSurface(theme->p1box->getSDLSurface(),NULL,backgroundSurf,NULL); - } else { -- SDL_FillRect(backgroundSurf,NULL,SDL_MapRGB(backgroundSurf->format, 255, 255, 255)); - SDL_BlitSurface(theme->bg->getSDLSurface(),NULL,backgroundSurf,NULL); - SDL_BlitSurface(theme->p1box->getSDLSurface(),NULL,backgroundSurf,NULL); - } Deleted: packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch =================================================================== --- packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch 2007-11-02 15:10:25 UTC (rev 4537) @@ -1,20 +0,0 @@ -# xine ogg/vorbis decode that doesn't support seeking if the ogg file hasn't been started. -# The bug has been confirmed by Darren Salt from xine project. -# -# Waiting for xine patch, the following ultrastar-ng patch works -# http://ultrastar-ng.cvs.sourceforge.net/ultrastar-ng/UltraStar-ng/src/audio.cpp?r1=1.27&r2=1.28 -# -# See http://bugs.debian.org/430531 - -diff -ruN ultrastar-ng-0.1.4.orig/src/audio.cpp ultrastar-ng-0.1.4/src/audio.cpp ---- ultrastar-ng-0.1.4.orig/src/audio.cpp 2007-04-16 21:16:17.000000000 +0000 -+++ ultrastar-ng-0.1.4/src/audio.cpp 2007-07-11 08:39:10.000000000 +0000 -@@ -97,7 +97,7 @@ - int pos_stream; - int pos_time; - -- if (!xine_open(stream, filename) || !xine_play(stream, 0, 30000)) { -+ if (!xine_open(stream, filename) || !xine_play(stream, 0, 0) || !xine_play(stream, 0, 30000)) { - printf("could not open %s\n", filename); - } - Modified: packages/trunk/ultrastar-ng/debian/rules =================================================================== --- packages/trunk/ultrastar-ng/debian/rules 2007-11-02 13:43:58 UTC (rev 4536) +++ packages/trunk/ultrastar-ng/debian/rules 2007-11-02 15:10:25 UTC (rev 4537) @@ -32,60 +32,64 @@ printf "\n" touch $@ -config-gstreamer-smpeg-librsvg: config-gstreamer-smpeg-librsvg-stamp -config-gstreamer-smpeg-librsvg-stamp: config-common +config-gstreamer-librsvg: config-gstreamer-librsvg-stamp +config-gstreamer-librsvg-stamp: config-common # TARGET: $@ dh_testdir - printf "\nConfiguring gstreamer-smpeg-librsvg\n\n" + 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" + LDFLAGS="-Wl,-z,defs -Wl,--rpath,/usr/lib/ultrastar-ng" printf "\n" touch $@ -build-gstreamer-smpeg-librsvg: build-gstreamer-smpeg-librsvg-stamp -build-gstreamer-smpeg-librsvg-stamp: config-gstreamer-smpeg-librsvg +build-gstreamer-librsvg: build-gstreamer-librsvg-stamp +build-gstreamer-librsvg-stamp: config-gstreamer-librsvg # TARGET: $@ dh_testdir - printf "\nBuilding gstreamer-smpeg-librsvg\n\n" + printf "\nBuilding gstreamer-librsvg\n\n" cd tmp-gst-smpeg-rsvg; $(MAKE) printf "\n" touch $@ -config-xine-smpeg-librsvg: config-xine-smpeg-librsvg-stamp -config-xine-smpeg-librsvg-stamp: config-common +config-xine-librsvg: config-xine-librsvg-stamp +config-xine-librsvg-stamp: config-common # TARGET: $@ dh_testdir - printf "\nConfiguring xine-smpeg-librsvg\n\n" + 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" + LDFLAGS="-Wl,-z,defs -Wl,--rpath,/usr/lib/ultrastar-ng" printf "\n" touch $@ -build-xine-smpeg-librsvg: build-xine-smpeg-librsvg-stamp -build-xine-smpeg-librsvg-stamp: config-xine-smpeg-librsvg +build-xine-librsvg: build-xine-librsvg-stamp +build-xine-librsvg-stamp: config-xine-librsvg # TARGET: $@ dh_testdir - printf "\nBuilding xine-smpeg-librsvg\n\n" + printf "\nBuilding xine-librsvg\n\n" cd tmp-xine-smpeg-rsvg; $(MAKE) printf "\n" touch $@ -config: config-common config-gstreamer-smpeg-librsvg config-xine-smpeg-librsvg +config: config-common config-gstreamer-librsvg config-xine-librsvg build: build-stamp -build-stamp: config build-gstreamer-smpeg-librsvg build-xine-smpeg-librsvg +build-stamp: config build-gstreamer-librsvg build-xine-librsvg # TARGET: $@ #docbook-to-man debian/ultrastar-ng.sgml > ultrastar-ng.1 touch $@ @@ -111,11 +115,11 @@ dh_clean -a -k dh_installdirs - printf "\nInstalling gstreamer-smpeg-librsvg\n\n" + printf "\nInstalling gstreamer-librsvg\n\n" cd tmp-gst-smpeg-rsvg; $(MAKE) install DESTDIR=$(CURDIR)/debian/ultrastar-ng-gstreamer printf "\n" - printf "\nInstalling xine-smpeg-librsvg\n\n" + printf "\nInstalling xine-librsvg\n\n" cd tmp-xine-smpeg-rsvg; $(MAKE) install DESTDIR=$(CURDIR)/debian/ultrastar-ng-xine printf "\n" @@ -166,6 +170,6 @@ dh_builddeb -a binary: binary-indep binary-arch -.PHONY: config-common config-gstreamer-smpeg-librsvg config-xine-smpeg-librsvg -.PHONY: build-gstreamer-smpeg-librsvg build-xine-smpeg-librsvg +.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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
