r9408 - in packages/trunk/attal/debian: . patches

[Paul Wise]

Author: pabs
Date: 2009-04-05 08:56:20 +0000 (Sun, 05 Apr 2009)
New Revision: 9408

Removed:
   packages/trunk/attal/debian/patches/10_libpath.diff
Modified:
   packages/trunk/attal/debian/changelog
   packages/trunk/attal/debian/patches/series
   packages/trunk/attal/debian/rules
Log:
Drop 10_libpath.diff in favour of ATT_LIB_PREFIX

Modified: packages/trunk/attal/debian/changelog
===================================================================
--- packages/trunk/attal/debian/changelog	2009-04-05 08:53:36 UTC (rev 9407)
+++ packages/trunk/attal/debian/changelog	2009-04-05 08:56:20 UTC (rev 9408)
@@ -1,6 +1,7 @@
 attal (1.0~rc2-1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  * Drop 10_libpath.diff in favour of ATT_LIB_PREFIX
 
  -- Paul Wise <pabs at debian.org>  Sun, 05 Apr 2009 16:15:22 +0800
 

Deleted: packages/trunk/attal/debian/patches/10_libpath.diff
===================================================================
--- packages/trunk/attal/debian/patches/10_libpath.diff	2009-04-05 08:53:36 UTC (rev 9407)
+++ packages/trunk/attal/debian/patches/10_libpath.diff	2009-04-05 08:56:20 UTC (rev 9408)
@@ -1,60 +0,0 @@
-diff -urN attal-1.0~rc1.orig.orig/libAi/libAi.pro attal-1.0~rc1.orig/libAi/libAi.pro
---- attal-1.0~rc1.orig.orig/libAi/libAi.pro	2007-06-05 17:20:17.000000000 -0400
-+++ attal-1.0~rc1.orig/libAi/libAi.pro	2008-03-18 21:16:26.000000000 -0400
-@@ -31,7 +31,7 @@
- TARGET = AttalAi
- 
- unix {
--	target.path = $${ATT_PREFIX}/lib/
-+	target.path = $${ATT_PREFIX}/lib/attal/
- 	INSTALLS += target
- }
- 
-diff -urN attal-1.0~rc1.orig.orig/libClient/libClient.pro attal-1.0~rc1.orig/libClient/libClient.pro
---- attal-1.0~rc1.orig.orig/libClient/libClient.pro	2008-02-27 14:39:14.000000000 -0500
-+++ attal-1.0~rc1.orig/libClient/libClient.pro	2008-03-18 21:17:47.000000000 -0400
-@@ -143,7 +143,7 @@
- TARGET = AttalClient
- 
- unix {
--	target.path = $${ATT_PREFIX}/lib/
-+	target.path = $${ATT_PREFIX}/lib/attal/
- 	INSTALLS += target
- }
- 
-diff -urN attal-1.0~rc1.orig.orig/libCommon/libCommon.pro attal-1.0~rc1.orig/libCommon/libCommon.pro
---- attal-1.0~rc1.orig.orig/libCommon/libCommon.pro	2008-02-27 14:39:14.000000000 -0500
-+++ attal-1.0~rc1.orig/libCommon/libCommon.pro	2008-03-18 21:17:36.000000000 -0400
-@@ -122,7 +122,7 @@
- TARGET = AttalCommon
- 
- unix {
--	target.path = $${ATT_PREFIX}/lib/
-+	target.path = $${ATT_PREFIX}/lib/attal/
- 	INSTALLS += target
- }
- 
-diff -urN attal-1.0~rc1.orig.orig/libFight/libFight.pro attal-1.0~rc1.orig/libFight/libFight.pro
---- attal-1.0~rc1.orig.orig/libFight/libFight.pro	2007-06-05 17:20:18.000000000 -0400
-+++ attal-1.0~rc1.orig/libFight/libFight.pro	2008-03-18 21:18:33.000000000 -0400
-@@ -54,7 +54,7 @@
- TARGET = AttalFight
- 
- unix {
--	target.path = $${ATT_PREFIX}/lib/
-+	target.path = $${ATT_PREFIX}/lib/attal/
- 	INSTALLS += target
- }
- 
-diff -urN attal-1.0~rc1.orig.orig/libServer/libServer.pro attal-1.0~rc1.orig/libServer/libServer.pro
---- attal-1.0~rc1.orig.orig/libServer/libServer.pro	2008-02-27 14:39:14.000000000 -0500
-+++ attal-1.0~rc1.orig/libServer/libServer.pro	2008-03-18 21:18:49.000000000 -0400
-@@ -41,7 +41,7 @@
- TARGET = AttalServer
- 
- unix {
--	target.path = $${ATT_PREFIX}/lib/
-+	target.path = $${ATT_PREFIX}/lib/attal/
- 	INSTALLS += target
- }
- 

Modified: packages/trunk/attal/debian/patches/series
===================================================================
--- packages/trunk/attal/debian/patches/series	2009-04-05 08:53:36 UTC (rev 9407)
+++ packages/trunk/attal/debian/patches/series	2009-04-05 08:56:20 UTC (rev 9408)
@@ -1,4 +1,3 @@
 05_rpath.diff
-10_libpath.diff
 20_no_themes.diff
 30_ftbfs_gcc-4.3.diff

Modified: packages/trunk/attal/debian/rules
===================================================================
--- packages/trunk/attal/debian/rules	2009-04-05 08:53:36 UTC (rev 9407)
+++ packages/trunk/attal/debian/rules	2009-04-05 08:56:20 UTC (rev 9408)
@@ -2,13 +2,15 @@
 
 export QTDIR=/usr/share/qt4
 #export DH_OPTIONS
+export ATT_PREFIX=/usr
+export ATT_LIB_PREFIX=/usr/lib/attal
 
 include /usr/share/quilt/quilt.make
 
 build: patch build-stamp
 build-stamp:
 	dh_testdir
-	ATT_PREFIX=/usr ./autogen.sh
+	./autogen.sh
 #	qmake Makefile.pro
 	$(MAKE)
 	lrelease i18n/*/*.ts