debian: align the package with latest cmake change.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4806 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-07-14 09:21:57 +00:00
parent 83b3ac85d3
commit 9b66620287
13 changed files with 48 additions and 164 deletions

View File

@ -0,0 +1,14 @@
pcsx2/gui/Resources/ConfigIcon_Cpu.h
pcsx2/gui/Resources/AppIcon32.h
pcsx2/gui/Resources/AppIcon16.h
pcsx2/gui/Resources/ConfigIcon_Paths.h
pcsx2/gui/Resources/ConfigIcon_Video.h
pcsx2/gui/Resources/BackgroundLogo.h
pcsx2/gui/Resources/ConfigIcon_Plugins.h
pcsx2/gui/Resources/AppIcon64.h
pcsx2/gui/Resources/ConfigIcon_Appearance.h
pcsx2/gui/Resources/ConfigIcon_Speedhacks.h
pcsx2/gui/Resources/ConfigIcon_MemoryCard.h
pcsx2/gui/Resources/Dualshock.h
pcsx2/gui/Resources/ConfigIcon_Gamefixes.h
pcsx2/gui/Resources/ButtonIcon_Camera.h

View File

@ -3,23 +3,24 @@ Section: contrib/games
Priority: optional
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
# WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6...
# WARNING Natty need at least cmake 2.8.5
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
gcc-multilib [amd64], g++-multilib [amd64],
locales|locales-all,
zlib1g-dev (>= 1:1.2.3.3) | lib32z1-dev (>= 1.2.3.3) [amd64],
libbz2-dev (>= 1.0.4),
libbz2-dev,
libsdl1.2-dev,
libjpeg-dev,
libwxbase2.8-dev,
libwxbase2.8-dev,
libwxgtk2.8-dev,
libgtk2.0-dev (>= 2.16),
libasound2-dev | lib32asound2-dev [amd64],
portaudio19-dev,
# 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment
libsoundtouch0-dev | lib32soundtouch0-dev [amd64] | libsoundtouch1-dev (>= 1.3),
libsparsehash-dev (>= 1.6),
libsparsehash-dev,
libx11-dev,
libglew1.5-dev (>= 1.5.1),
libglew1.5-dev,
libgl1-mesa-dev,
libglu1-mesa-dev,
ia32-libs-dev [amd64],
@ -121,7 +122,7 @@ Architecture: all
Depends: ${misc:Depends}
Recommends: pcsx2-unstable (>= ${source:Version})
Conflicts: pcsx2-l10n
Description: Languages package for PCSX2
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

View File

@ -2,22 +2,24 @@ Source: pcsx2.snapshot
Section: games
Priority: optional
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
# WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6...
# WARNING Natty need at least cmake 2.8.5
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),
libbz2-dev,
libsdl1.2-dev,
libjpeg-dev,
libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11),
libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
libwxbase2.8-dev,
libwxgtk2.8-dev,
libgtk2.0-dev (>= 2.16),
libasound2-dev,
portaudio19-dev,
# 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment
libsoundtouch0-dev | libsoundtouch1-dev (>= 1.3),
libsparsehash-dev (>= 1.6),
libsparsehash-dev,
libx11-dev,
libglew1.5-dev (>= 1.5.1),
libglew1.5-dev,
libgl1-mesa-dev,
libglu1-mesa-dev,
nvidia-cg-toolkit-pcsx2
@ -27,7 +29,7 @@ Homepage: http://pcsx2.net/
Package: pcsx2-unstable
Architecture: i386
Depends: ${shlibs:Depends}, ${misc:Depends},
pcsx2-data-unstable (>= ${binary:Version}),
pcsx2-data-unstable (>= ${source:Version}),
pcsx2-plugins-unstable (>= ${binary:Version})
Conflicts: pcsx2
Description: Playstation 2 emulator
@ -42,7 +44,7 @@ Description: Playstation 2 emulator
Package: pcsx2-data-unstable
Architecture: all
Depends: ${misc:Depends}
Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version})
Recommends: pcsx2-unstable (>= ${source:Version}), pcsx2-plugins-unstable (>= ${source:Version})
Conflicts: pcsx2-data
Description: data for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and Linux.
@ -59,7 +61,7 @@ Architecture: i386
Depends: ${shlibs:Depends}, ${misc:Depends},
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
Recommends: pcsx2-unstable (>= ${binary:Version}),
pcsx2-data-unstable (>= ${binary:Version})
pcsx2-data-unstable (>= ${source:Version})
Conflicts: pcsx2-plugins
Description: Various plugins for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and Linux.
@ -106,7 +108,8 @@ Priority: optional
# Warning amd64 need additional ia32libs
Architecture: all
Depends: ${misc:Depends}
Conflicts: pcsx2-plugins-dbg
Recommends: pcsx2-unstable (>= ${source:Version})
Conflicts: pcsx2-l10n
Description: Languages package for PCSX2
PCSX2 is a PlayStation 2 emulator for Windows and Linux.
.

View File

@ -11,7 +11,7 @@ Index: pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
{
- return AppRoot() + Base::Plugins();
+ // return AppRoot() + Base::Plugins();
+ return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins();
+ return wxDirName( L"/usr/lib/games/pcsx2" );
}
wxDirName GetThemes()

View File

@ -1,2 +1,2 @@
usr/share/games/pcsx2/shaders
var/games/pcsx2
var/games/pcsx2/

View File

@ -1,2 +1,2 @@
bin/plugins/ps2hw.dat usr/share/games/pcsx2/shaders/
usr/share/games/pcsx2/shaders
bin/GameIndex.dbf var/games/pcsx2/

View File

@ -1 +1,2 @@
usr/share
usr/share/games/pcsx2/shaders
var/games/pcsx2/

View File

@ -1 +1 @@
usr/lib/games/pcsx2/plugins
usr/lib/games/pcsx2

View File

@ -1 +1 @@
bin/plugins/lib* usr/lib/games/pcsx2/plugins
usr/lib/games/pcsx2

View File

@ -1,3 +1,3 @@
bin/pcsx2 usr/games
usr/bin/pcsx2
debian/pcsx2.desktop usr/share/applications
debian/pcsx2.xpm usr/share/pixmaps

View File

@ -10,65 +10,24 @@ else
CMAKE_BUILD_TYPE=Release
endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
build: build-stamp
build-stamp:
dh_testdir
# backup orig makefile
for makefile in `find ./ -name "Makefile"` ; do [ -f $${makefile}.orig ] || mv $${makefile} $${makefile}.orig ; done
# Cmake based makefile
cmake CMakeLists.txt \
override_dh_auto_configure:
dh_auto_configure -- \
-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)" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DPACKAGE_MODE=TRUE
$(MAKE) $(MAKEFLAGS)
touch build-stamp
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Backup some orig makefile if it's not already done.
# I hope that some will be delete by upstream when the cmake port is over.
# Note: In case that we do not dl all the plugins, the test [ -f $${makefile} ] ensures it works
for makefile in plugins/CDVDlinuz/Src/Linux/Makefile \
plugins/CDVDiso/src/Linux/Makefile \
plugins/CDVDiso/src/Windows/Makefile \
plugins/USBnull/Windows/Makefile \
plugins/FWnull/Windows/Makefile \
plugins/PeopsSPU2/Makefile \
plugins/CDVDisoEFP/src/Linux/Makefile ; do \
[ -f $${makefile}.orig ] || ( [ -f $${makefile} ] && mv $${makefile} $${makefile}.orig ) || true ; done
# Add here the commands to clean up after the build process.
[ -f Makefile ] && $(MAKE) clean || true
# Remove cmake stuff
rm -fr $$(find . -type d -name CMakeFiles)
rm -f $$(find . -type f -name CMakeCache.txt) $$(find . -type f -name cmake_install.cmake)
rm -f $$(find . -type f -name Makefile)
# leftover of cmake
rm -f bin/plugins/ps2hw.dat
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_auto_clean
rm -fr obj-* # Remove cmake stuff in case auto_clean does not do its jobs properly
dh_clean
@ -80,11 +39,7 @@ override_dh_strip:
dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg
dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg
# Avoid to relaunch the compilation twice. (build and dh_auto_build target)
override_dh_auto_build:
# Do nothing
%:
dh $@
dh $@ --parallel
.PHONY: build clean install

View File

@ -1,90 +0,0 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CMAKE_BUILD_TYPE=Debug
else
CMAKE_BUILD_TYPE=Release
endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
build: build-stamp
build-stamp:
dh_testdir
# backup orig makefile
for makefile in `find ./ -name "Makefile"` ; do [ -f $${makefile}.orig ] || mv $${makefile} $${makefile}.orig ; done
# Cmake based makefile
cmake CMakeLists.txt \
-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)" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DPACKAGE_MODE=TRUE
$(MAKE) $(MAKEFLAGS)
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Backup some orig makefile if it's not already done.
# I hope that some will be delete by upstream when the cmake port is over.
# Note: In case that we do not dl all the plugins, the test [ -f $${makefile} ] ensures it works
for makefile in plugins/CDVDlinuz/Src/Linux/Makefile \
plugins/CDVDiso/src/Linux/Makefile \
plugins/CDVDiso/src/Windows/Makefile \
plugins/USBnull/Windows/Makefile \
plugins/FWnull/Windows/Makefile \
plugins/PeopsSPU2/Makefile \
plugins/CDVDisoEFP/src/Linux/Makefile ; do \
[ -f $${makefile}.orig ] || ( [ -f $${makefile} ] && mv $${makefile} $${makefile}.orig ) || true ; done
# Add here the commands to clean up after the build process.
[ -f Makefile ] && $(MAKE) clean || true
# Remove cmake stuff
rm -fr $$(find . -type d -name CMakeFiles)
rm -f $$(find . -type f -name CMakeCache.txt) $$(find . -type f -name cmake_install.cmake)
rm -f $$(find . -type f -name Makefile)
# leftover of cmake
rm -f bin/plugins/ps2hw.dat
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
# Allow compilation when fglrx is installed
override_dh_shlibdeps:
dh_shlibdeps -- --ignore-missing-info
override_dh_strip:
dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg
dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg
# Avoid to relaunch the compilation twice. (build and dh_auto_build target)
override_dh_auto_build:
# Do nothing
%:
dh $@
.PHONY: build clean install

View File

@ -1,2 +1,2 @@
# Don't store changes on locales files
extend-diff-ignore = "(^|/)(pcsx2_(Devel|Iconized|Main|Tertiary)\.po)$"
extend-diff-ignore = "(^|/)(pcsx2_(Devel|Iconized|Main|Tertiary)\.po|Makefile)$"