Author: baby-guest
Date: 2007-05-10 16:12:54 +0000 (Thu, 10 May 2007)
New Revision: 2646

Added:
   packages/trunk/ultrastar-ng/debian/ultrastar-ng-gstreamer.dirs
   packages/trunk/ultrastar-ng/debian/ultrastar-ng-xine.dirs
Removed:
   packages/trunk/ultrastar-ng/debian/dirs
Modified:
   packages/trunk/ultrastar-ng/debian/control
   packages/trunk/ultrastar-ng/debian/rules
Log:
Added void package
Tidy up rules a bit



Modified: packages/trunk/ultrastar-ng/debian/control
===================================================================
--- packages/trunk/ultrastar-ng/debian/control  2007-05-10 09:55:10 UTC (rev 
2645)
+++ packages/trunk/ultrastar-ng/debian/control  2007-05-10 16:12:54 UTC (rev 
2646)
@@ -6,9 +6,23 @@
 Build-Depends: debhelper (>= 5), autotools-dev, quilt, libsdl1.2-dev, 
libsdl-image1.2-dev, libsdl-gfx1.2-dev, libcairo2-dev, librsvg2-dev, 
libsmpeg-dev, fftw3-dev, libasound2-dev, libgstreamer0.10-dev, libxine-dev, 
libxml2-dev
 Standards-Version: 3.7.2
 
+Package: ultrastar-ng
+Architecture: all
+Depends: ultrastar-ng-xine | ultrastar-ng-gstreamer
+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.
+ .
+  Homepage: http://ultrastar-ng.sourceforge.net/
+
+
 Package: ultrastar-ng-gstreamer
 Provides: ultrastar-ng
-Conflicts: ultrastar-ng
+Conflicts: ultrastar-ng-xine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: karaoke game that allows user supplied songs
@@ -23,7 +37,7 @@
 
 Package: ultrastar-ng-xine
 Provides: ultrastar-ng
-Conflicts: ultrastar-ng
+Conflicts: ultrastar-ng-gstreamer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: karaoke game that allows user supplied songs

Deleted: packages/trunk/ultrastar-ng/debian/dirs
===================================================================
--- packages/trunk/ultrastar-ng/debian/dirs     2007-05-10 09:55:10 UTC (rev 
2645)
+++ packages/trunk/ultrastar-ng/debian/dirs     2007-05-10 16:12:54 UTC (rev 
2646)
@@ -1,4 +0,0 @@
-usr/games
-usr/share/games/ultrastar-ng
-usr/share/games/ultrastar-ng/themes
-usr/share/games/ultrastar-ng/songs

Modified: packages/trunk/ultrastar-ng/debian/rules
===================================================================
--- packages/trunk/ultrastar-ng/debian/rules    2007-05-10 09:55:10 UTC (rev 
2645)
+++ packages/trunk/ultrastar-ng/debian/rules    2007-05-10 16:12:54 UTC (rev 
2646)
@@ -27,9 +27,7 @@
        cp -f /usr/share/misc/config.guess config.guess
 endif
 
-       #
-       # Configuring gstreamer-smpeg-librsvg version
-       #
+       printf "\nConfiguring gstreamer-smpeg-librsvg version\n\n"
        mkdir tmp-gst-smpeg-rsvg; cd tmp-gst-smpeg-rsvg; "$(CURDIR)/configure" \
        --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
        --prefix=/usr --bindir=\$${prefix}/games 
--datadir=\$${prefix}/share/games \
@@ -37,11 +35,9 @@
        --with-audio=gstreamer --with-video=smpeg --with-svg=librsvg \
        CFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" CPPFLAGS="$(CFLAGS) 
-I\"$(CURDIR)/include\"" \
        LDFLAGS="-Wl,-z,defs"
-       #
+       printf "\n"
 
-       #
-       # Configuring xine-smpeg-librsvg version
-       #
+       printf "\nConfiguring xine-smpeg-librsvg version\n\n"
        mkdir tmp-xine-smpeg-rsvg; cd tmp-xine-smpeg-rsvg; 
"$(CURDIR)/configure" \
        --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
        --prefix=/usr --bindir=\$${prefix}/games 
--datadir=\$${prefix}/share/games \
@@ -49,19 +45,21 @@
        --with-audio=xine --with-video=smpeg --with-svg=librsvg \
        CFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" CPPFLAGS="$(CFLAGS) 
-I\"$(CURDIR)/include\"" \
        LDFLAGS="-Wl,-z,defs"
-       #
+       printf "\n"
 
 build: build-stamp
 
 build-stamp: config.status
        dh_testdir
 
-       #
-       # Building gstreamer-smpeg-librsvg version
-       #
+       printf "\nBuilding gstreamer-smpeg-librsvg version\n\n"
        cd tmp-gst-smpeg-rsvg; $(MAKE)
-       #
+       printf "\n"
 
+       printf "\nBuilding xine-smpeg-librsvg version\n\n"
+       cd tmp-xine-smpeg-rsvg; $(MAKE)
+       printf "\n"
+
        #docbook-to-man debian/ultrastar-ng.sgml > ultrastar-ng.1
        touch $@
 
@@ -70,18 +68,14 @@
        dh_testroot
        rm -f build-stamp
 
-       #
-       # Cleaning gstreamer-smpeg-librsvg version
-       #
+       printf "\nCleaning gstreamer-smpeg-librsvg version\n\n"
        -cd tmp-gst-smpeg-rsvg; $(MAKE) distclean
-       #
 
-       #
-       # Cleaning xine-smpeg-librsvg version
-       #
+       printf "\nCleaning xine-smpeg-librsvg version\n\n"
        -cd tmp-xine-smpeg-rsvg; $(MAKE) distclean
-       #
 
+       printf "\nCleaning the rest of temporary files\n\n"
+
        rm -rf tmp-*
 
        rm -rf config.guess config.sub config.log
@@ -91,58 +85,57 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_clean -a -k 
        dh_installdirs
 
-       #
-       # Installing gstreamer-smpeg-librsvg version
-       #
+       printf "\nInstalling gstreamer-smpeg-librsvg version\n\n"
        cd tmp-gst-smpeg-rsvg; $(MAKE) install 
DESTDIR=$(CURDIR)/debian/ultrastar-ng-gstreamer
-       #
+       printf "\n"
 
-       #
-       # Installing xine-smpeg-librsvg version
-       #
+       printf "\nInstalling xine-smpeg-librsvg version\n\n"
        cd tmp-xine-smpeg-rsvg; $(MAKE) install 
DESTDIR=$(CURDIR)/debian/ultrastar-ng-xine
-       #
-       dh_install -A debian/ultrastar-ng.desktop usr/share/applications
+       printf "\n"
 
 # Build architecture-independent files here.
-binary-indep: install
+binary-indep:
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs -i
+       dh_installdocs -i
+       dh_link -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
        dh_testdir
        dh_testroot
-       dh_installchangelogs ChangeLog
-       dh_installdocs
-       dh_installexamples
-#      dh_install
-       dh_install debian/ultrastar-ng.xpm usr/share/pixmaps
-       dh_desktop -A debian/ultrastar-ng.desktop
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-#      dh_installman debian/ultrastarng.6
-#      dh_install debian/ultrastar-ng.desktop usr/share/applications
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       #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
+       dh_installdocs -a
+       dh_installexamples -a
+#      dh_install -a
+       dh_install -a debian/ultrastar-ng.xpm usr/share/pixmaps
+       dh_install -a debian/ultrastar-ng.desktop usr/share/applications
+       dh_desktop -a -A debian/ultrastar-ng.desktop
+#      dh_installmenu -a
+#      dh_installmime -a
+#      dh_installman -a debian/ultrastarng.6
+       dh_link -a
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

Copied: packages/trunk/ultrastar-ng/debian/ultrastar-ng-gstreamer.dirs (from 
rev 2645, packages/trunk/ultrastar-ng/debian/dirs)

Copied: packages/trunk/ultrastar-ng/debian/ultrastar-ng-xine.dirs (from rev 
2645, packages/trunk/ultrastar-ng/debian/dirs)


_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to