r12914 - in packages/trunk/amphetamine/debian: . patches

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-12-03 00:06:02 +0000 (Sat, 03 Dec 2011)
New Revision: 12914

Modified:
   packages/trunk/amphetamine/debian/changelog
   packages/trunk/amphetamine/debian/control
   packages/trunk/amphetamine/debian/patches/000_data_path.diff
Log:
use multiarch paths

Modified: packages/trunk/amphetamine/debian/changelog
===================================================================
--- packages/trunk/amphetamine/debian/changelog	2011-12-02 04:02:48 UTC (rev 12913)
+++ packages/trunk/amphetamine/debian/changelog	2011-12-03 00:06:02 UTC (rev 12914)
@@ -1,3 +1,9 @@
+amphetamine (0.8.10-18) unstable; urgency=low
+
+  * Use multiarch paths for libc6-dev includes (closes: #650468).
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Fri, 02 Dec 2011 18:41:07 -0500
+
 amphetamine (0.8.10-17) unstable; urgency=low
 
   * Change build-depend to libc6-dev-i386 [amd64] (closes: #650468).

Modified: packages/trunk/amphetamine/debian/control
===================================================================
--- packages/trunk/amphetamine/debian/control	2011-12-02 04:02:48 UTC (rev 12913)
+++ packages/trunk/amphetamine/debian/control	2011-12-03 00:06:02 UTC (rev 12914)
@@ -5,7 +5,6 @@
  debhelper (>= 8),
  libxpm-dev,
  libsdl1.2-dev (>= 1.2.2-3.1),
- libc6-dev-i386 [amd64],
  dpkg-dev (>= 1.9.0)
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: 

Modified: packages/trunk/amphetamine/debian/patches/000_data_path.diff
===================================================================
--- packages/trunk/amphetamine/debian/patches/000_data_path.diff	2011-12-02 04:02:48 UTC (rev 12913)
+++ packages/trunk/amphetamine/debian/patches/000_data_path.diff	2011-12-03 00:06:02 UTC (rev 12914)
@@ -1,9 +1,9 @@
 description: use debian data paths
-Index: amphetamine-0.8.10/Makefile
+Index: amphetamine/Makefile
 ===================================================================
---- amphetamine-0.8.10.orig/Makefile	2006-05-15 19:12:50.000000000 +0200
-+++ amphetamine-0.8.10/Makefile	2006-05-15 19:13:05.000000000 +0200
-@@ -3,8 +3,8 @@
+--- amphetamine.orig/Makefile	2011-12-02 18:48:23.000000000 -0500
++++ amphetamine/Makefile	2011-12-02 18:49:46.000000000 -0500
+@@ -3,8 +3,9 @@
  #===============
  
  # Install Paths
@@ -11,10 +11,11 @@
 -INSTALL_DIR := ${PREFIX}/games/amph
 +PREFIX := /usr
 +INSTALL_DIR := ${PREFIX}/share/games/amphetamine
++MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
  # Libraries
  USE_LIB_XPM := TRUE
-@@ -22,7 +22,7 @@
+@@ -22,7 +23,7 @@
  
  # Directories to search for header files
  
@@ -23,7 +24,7 @@
  
  # makemake variables
  
-@@ -73,10 +73,9 @@
+@@ -73,10 +74,9 @@
  
  .PHONY : install
  install: amph
@@ -37,3 +38,12 @@
  
  # This is what makemake added
  
+@@ -194,7 +194,7 @@
+ 
+ ./src/Surface.o: ./src/AmpHead.hpp ./src/Clut.hpp ./src/ConstVal.hpp ./src/Graphfil.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h
+ 
+-./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp /usr/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h
++./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp /usr/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/$(MULTIARCH)/sys/stat.h /usr/include/$(MULTIARCH)/sys/time.h /usr/include/$(MULTIARCH)/sys/types.h /usr/include/unistd.h
+ 
+ ./src/Thing.o: ./src/AmpHead.hpp ./src/Appl.hpp ./src/Bullet.hpp ./src/ConstVal.hpp ./src/Element.hpp ./src/File.hpp ./src/Graphfil.hpp ./src/Level.hpp ./src/ObjInfo.hpp ./src/Object.hpp ./src/Pltform.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp ./src/Thing.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h
+