From 647f84d08efd290f29bbb68189ddffa750299229 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Sun, 12 Sep 2010 14:27:33 +0000 Subject: [PATCH] debian: * drop libxxf86vm-dev dependency * do not twice the link git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3757 96395faa-99c1-11dd-bbfe-3dabce05a288 --- debian-unstable-upstream/control | 1 - debian-unstable-upstream/control_ppa | 1 - debian-unstable-upstream/rules | 4 ++++ debian-unstable-upstream/rules_fglrx | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control index d265f62770..43fa20640f 100644 --- a/debian-unstable-upstream/control +++ b/debian-unstable-upstream/control @@ -21,7 +21,6 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8), libsoundtouch1-dev (>= 1.3), libsparsehash-dev (>= 1.6), libx11-dev, - libxxf86vm-dev, libglew1.5-dev (>= 1.5.1), libgl1-mesa-dev, libglu1-mesa-dev, diff --git a/debian-unstable-upstream/control_ppa b/debian-unstable-upstream/control_ppa index 109338502a..6a0e8af919 100644 --- a/debian-unstable-upstream/control_ppa +++ b/debian-unstable-upstream/control_ppa @@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8), libsoundtouch1-dev (>= 1.3), libsparsehash-dev (>= 1.6), libx11-dev, - libxxf86vm-dev, libglew1.5-dev (>= 1.5.1), libgl1-mesa-dev, libglu1-mesa-dev, diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules index 788f6a4215..3b4533aef0 100755 --- a/debian-unstable-upstream/rules +++ b/debian-unstable-upstream/rules @@ -77,6 +77,10 @@ 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 $@ --parallel diff --git a/debian-unstable-upstream/rules_fglrx b/debian-unstable-upstream/rules_fglrx index 5e7540a5d5..ebd5629269 100755 --- a/debian-unstable-upstream/rules_fglrx +++ b/debian-unstable-upstream/rules_fglrx @@ -77,6 +77,10 @@ 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 $@ --parallel