From 101a60a5a439c29c064089b3aacf5e6295795a64 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Sat, 22 Jan 2011 15:28:47 +0000 Subject: [PATCH] debian: forget 2 files git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4250 96395faa-99c1-11dd-bbfe-3dabce05a288 --- debian-unstable-upstream/control_ppa | 39 +++++++++++++++++----------- debian-unstable-upstream/rules_fglrx | 5 +++- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/debian-unstable-upstream/control_ppa b/debian-unstable-upstream/control_ppa index 076f24623a..7d42ef4cf2 100644 --- a/debian-unstable-upstream/control_ppa +++ b/debian-unstable-upstream/control_ppa @@ -3,6 +3,7 @@ Section: games Priority: optional Maintainer: Gregory Hainaut Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8), + locales|locales-all, zlib1g-dev (>= 1:1.2.3.3), libbz2-dev (>= 1.0.4), libsdl1.2-dev, @@ -12,10 +13,8 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8), libgtk2.0-dev (>= 2.16), libasound2-dev, portaudio19-dev, -# version not yet in debian -# libsoundtouch1-dev (>= 1.5), -# I patch the source (remove feature) to compile with version 1.3 - libsoundtouch1-dev (>= 1.3), +# 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment + libsoundtouch1-dev (>= 1.3)| libsoundtouch0-dev, libsparsehash-dev (>= 1.6), libx11-dev, libglew1.5-dev (>= 1.5.1), @@ -32,8 +31,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-plugins-unstable (>= ${binary:Version}) Conflicts: pcsx2 Description: Playstation 2 emulator - PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same - team that brought you PCSX (a Sony PlayStation 1 emulator). + PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support this instruction set, it does not have enough horse power to run this emulator @@ -41,15 +39,13 @@ Description: Playstation 2 emulator . This package includes the main binary file. - Package: pcsx2-data-unstable Architecture: all Depends: ${misc:Depends} Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version}) Conflicts: pcsx2-data Description: data for pcsx2 - PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same - team that brought you PCSX (a Sony PlayStation 1 emulator). + PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support this instruction set, it does not have enough horse power to run this emulator @@ -66,8 +62,7 @@ Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version}) Conflicts: pcsx2-plugins Description: Various plugins for pcsx2 - PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same - team that brought you PCSX (a Sony PlayStation 1 emulator). + PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support this instruction set, it does not have enough horse power to run this emulator @@ -82,8 +77,7 @@ Architecture: i386 Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version}) Conflicts: pcsx2-dbg Description: Debug symbols for pcsx2 - PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same - team that brought you PCSX (a Sony PlayStation 1 emulator). + PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support this instruction set, it does not have enough horse power to run this emulator @@ -98,11 +92,26 @@ Architecture: i386 Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version}) Conflicts: pcsx2-plugins-dbg Description: Debug symbols of the pcsx2-plugins - PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same - team that brought you PCSX (a Sony PlayStation 1 emulator). + PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support this instruction set, it does not have enough horse power to run this emulator anyway. . This package contains the debug symbols of the pcsx2 plugins. + +Package: pcsx2-l10n-unstable +Section: localization +Priority: optional +# Warning amd64 need additional ia32libs +Architecture: all +Depends: ${misc:Depends} +Conflicts: pcsx2-plugins-dbg +Description: Languages package for PCSX2 + PCSX2 is a PlayStation 2 emulator for Windows and Linux. + . + WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support + this instruction set, it does not have enough horse power to run this emulator + anyway. + . + This package contains the localization of the emulator in various languages. diff --git a/debian-unstable-upstream/rules_fglrx b/debian-unstable-upstream/rules_fglrx index 0a542e146f..958a0567be 100755 --- a/debian-unstable-upstream/rules_fglrx +++ b/debian-unstable-upstream/rules_fglrx @@ -30,6 +30,7 @@ build-stamp: -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ -DCMAKE_BUILD_STRIP=FALSE \ -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ + -DL10N_PORTABLE=FALSE \ -DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \ -DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" $(MAKE) $(MAKEFLAGS) @@ -64,6 +65,8 @@ clean: rm -f pcsx2/svnrev.h # Restore orig makefile for makefile_orig in `find ./ -name "Makefile.orig"` ; do [ -f $${makefile_orig} ] && mv $${makefile_orig} `echo $${makefile_orig} | sed -e 's/.orig//'` ; done + # do not know who create this file.... + rm -f install_manifest.txt dh_clean @@ -80,6 +83,6 @@ override_dh_auto_build: # Do nothing %: - dh $@ --parallel + dh $@ .PHONY: build clean install