From 1e30d6237c7bb3dafe19ca8507b508cd503d20d0 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 8 Aug 2008 15:37:53 +0000
Subject: debian package name changed to ultrastardx

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1243 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Makefile.in             | 24 +++++++++++-------------
 Game/Code/UltraStarDeluxe.control | 19 -------------------
 Game/Code/ultrastardx.control     | 19 +++++++++++++++++++
 Game/Code/ultrastardx.desktop     | 17 +++++++++++++++++
 4 files changed, 47 insertions(+), 32 deletions(-)
 delete mode 100644 Game/Code/UltraStarDeluxe.control
 create mode 100644 Game/Code/ultrastardx.control
 create mode 100644 Game/Code/ultrastardx.desktop

diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in
index 06826efd..5600bd4b 100644
--- a/Game/Code/Makefile.in
+++ b/Game/Code/Makefile.in
@@ -132,7 +132,7 @@ $(EXTRA_SRCDIRS):
 #################################################
 # build
 #################################################
-	
+
 # clean old data before compiling, otherwise FPC might miss some changes.
 $(USDX_BIN): lastmod 
 	$(MAKE) clean_obj
@@ -203,7 +203,7 @@ uninstall-exec:
 #################################################
 # Distributable source-package (TODO)
 #################################################
-	
+
 disttmpdir = ./distdir
 
 dist:
@@ -220,12 +220,10 @@ dist:
 debpkgoutdir = $(usdxrootdir)/packages
 debpkgtmpdir = $(debpkgoutdir)/deb-package
 # should be $(USDX_PACKAGE_NAME) instead
-debpkgprefix = UltraStarDeluxe
+debpkgprefix = ultrastardx
 debpkgname = $(debpkgprefix)_$(USDX_VERSION)_$(PPROCESSOR).deb
 
-debian-package: $(debpkgname)
-
-$(debpkgname): all
+debian-pkg: all
 	rm -rf $(debpkgtmpdir)
 	rm -rf $(debpkgoutdir)
 
@@ -239,7 +237,7 @@ $(debpkgname): all
 	dpkg-deb --build $(debpkgtmpdir)
 	mv $(debpkgtmpdir)/../deb-package.deb $(debpkgoutdir)/$(debpkgname)
 
-#	rm -rf $(debpkgtmpdir)
+	rm -rf $(debpkgtmpdir)
 
 #################################################
 # RPM (TODO)
@@ -251,7 +249,7 @@ rpm: all
 #################################################
 # Mac OS X app-bundle
 #################################################
-	
+
 macosx_bundle_path = $(usdxrootdir)/UltraStarDeluxe.app/Contents
 macosx-app: all 
 # Create double clickable Mac OS X application.
@@ -271,7 +269,7 @@ macosx-app: all
 
 # Copy the resources. 
 	$(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
-	
+
 # final messages
 	@echo ""
 	@echo "Mac OS X application created."
@@ -282,7 +280,7 @@ macosx-app: all
 #################################################
 # clean-up
 #################################################
-	
+
 clean: recursive-clean clean_obj
 
 recursive-clean: recursive-target = clean
@@ -306,13 +304,13 @@ clean_obj:
 #################################################
 # Resource-file
 #################################################
-	
+
 $(RESOURCE_FILE): $(USDX_PREFIX).rc
 	$(RESEXTRACTOR_BIN) $(USDX_PREFIX).rc $(RESOURCE_DIR) $(RESOURCE_FILE)
 
 clean_res:
 	rm -f "$(RESOURCE_FILE)"
-	
+
 #################################################
 # auto-update
 #################################################
@@ -324,7 +322,7 @@ update-modfile:
 	test -e $(modfile) || touch $(modfile)
 	find . \( -name "*.pas" -o -name "*.pp" -o -name "*.inc" -o -name "*.dpr" \) -newer $(modfile) -exec touch $(modfile) \;
 	find $(USDX_LIB_DIR) -name "*.a" -newer $(modfile) -exec touch $(modfile) \;
-	
+
 Makefile: Makefile.in config.status
 	./config.status
 
diff --git a/Game/Code/UltraStarDeluxe.control b/Game/Code/UltraStarDeluxe.control
deleted file mode 100644
index 4fb8753a..00000000
--- a/Game/Code/UltraStarDeluxe.control
+++ /dev/null
@@ -1,19 +0,0 @@
-Package: UltraStar-Deluxe
-Priority: optional
-Section: games
-Installed-Size: 18400
-Maintainer: Jay Binks <jaybinks@gmail.com>
-Architecture: i386
-Version: 1.1.1
-Depends: libc6 (>= 2.1), libsdl1.2debian-alsa, libportaudio2, libavcodec1d, libavformat1d, libsqlite3-0, libsdl-ttf2.0-0,  libsdl-image1.2
-Description: 
- Karaoke Software for PC like Singstar for PS2. 
- It evaluates your singing by analyzing your voice pitch. 
- Songs can be created with integrated Editor. 
- .
- This is a Fork of the UltraStar Project with many massive improvements. 
- .
- http://www.ultrastardeluxe.org/
-
-
-
diff --git a/Game/Code/ultrastardx.control b/Game/Code/ultrastardx.control
new file mode 100644
index 00000000..a1bb17f0
--- /dev/null
+++ b/Game/Code/ultrastardx.control
@@ -0,0 +1,19 @@
+Package: ultrastardx
+Priority: optional
+Section: games
+Installed-Size: 18400
+Maintainer: Jay Binks <jaybinks@gmail.com>
+Architecture: i386
+Version: 1.1.1
+Depends: libc6 (>= 2.1), libsdl1.2debian-alsa, libportaudio2, libavcodec1d, libavformat1d, libsqlite3-0, libsdl-ttf2.0-0,  libsdl-image1.2
+Description: 
+ Karaoke Software for PC like Singstar for PS2. 
+ It evaluates your singing by analyzing your voice pitch. 
+ Songs can be created with integrated Editor. 
+ .
+ This is a Fork of the UltraStar Project with many massive improvements. 
+ .
+ http://www.ultrastardeluxe.org/
+
+
+
diff --git a/Game/Code/ultrastardx.desktop b/Game/Code/ultrastardx.desktop
new file mode 100644
index 00000000..d49f05ef
--- /dev/null
+++ b/Game/Code/ultrastardx.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+
+Name=UltraStar Deluxe
+Comment=Karaoke program that evaluates your performance
+Comment[de]=Singe Karaoke und messe dich mit anderen Spielern
+
+Icon=ultrastardx
+
+TryExec=ultrastardx
+Exec=ultrastardx
+StartupNotify=false
+Terminal=false
+
+Type=Application
+Categories=Application;Game;ArcadeGame;
-- 
cgit v1.2.3