r3188 - in packages/trunk/moagg/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-07-02 19:40:16 +0000 (Mon, 02 Jul 2007)
New Revision: 3188

Modified:
   packages/trunk/moagg/debian/changelog
   packages/trunk/moagg/debian/patches/01_Makefile.in.diff
   packages/trunk/moagg/debian/patches/series
Log:
+  * Apply patchs to fix FTBFS with gcc 4.2
+   + thanks: Mark Brown, Martin Michlmayr and Brian m. Carlson
+   + add gcc-4.2.diff (Closes: #361404)
+   + add gcc-4.2-warn.diff (Closes: #385712)
+  * update 01_Makefile.in.diff so Makefile doesn't try to copy data file
+   (Closes: #424574)



Modified: packages/trunk/moagg/debian/changelog
===================================================================
--- packages/trunk/moagg/debian/changelog	2007-07-02 18:47:57 UTC (rev 3187)
+++ packages/trunk/moagg/debian/changelog	2007-07-02 19:40:16 UTC (rev 3188)
@@ -4,8 +4,12 @@
   * fixed Homepage semifield
 
   [ Gonéri Le Bouder ]
-  * Apply Mark Brown's patch to fix FTBFS with gcc 4.2 (Closes: #361404)
-   + add gcc-4.2.diff
+  * Apply patchs to fix FTBFS with gcc 4.2
+   + thanks: Mark Brown, Martin Michlmayr and Brian m. Carlson
+   + add gcc-4.2.diff (Closes: #361404)
+   + add gcc-4.2-warn.diff (Closes: #385712)
+  * update 01_Makefile.in.diff so Makefile doesn't try to copy data file
+   (Closes: #424574)
 
  -- Eddy Petrișor <eddy.petrisor at gmail.com>  Mon,  2 Jul 2007 17:18:59 +0200
 

Modified: packages/trunk/moagg/debian/patches/01_Makefile.in.diff
===================================================================
--- packages/trunk/moagg/debian/patches/01_Makefile.in.diff	2007-07-02 18:47:57 UTC (rev 3187)
+++ packages/trunk/moagg/debian/patches/01_Makefile.in.diff	2007-07-02 19:40:16 UTC (rev 3188)
@@ -19,9 +19,11 @@
 exit 0
 
 @DPATCH@
---- moagg-0.11.orig/Makefile.in	2004-06-19 14:03:50.000000000 +0200
-+++ moagg-0.11/Makefile.in	2004-06-20 12:07:01.000000000 +0200
-@@ -148,8 +148,8 @@
+Index: moagg-0.18/Makefile.in
+===================================================================
+--- moagg-0.18.orig/Makefile.in	2005-04-17 09:40:18.000000000 +0000
++++ moagg-0.18/Makefile.in	2007-07-02 19:36:11.000000000 +0000
+@@ -172,8 +172,8 @@
  	cd doc && rm -rf *.aux *.log *.toc *.ps *.pdf *.dvi html
  
  #-----------------------------------------------------------------------------
@@ -31,10 +33,15 @@
 +install: $(TARGETS) install-bin install-man install-doc 
  
  install-bin:
- 	install -d $(bindir)
-@@ -168,8 +168,8 @@
- 	cp -r levels sound cfg gfx $(datadir)/$(PACKAGE_NAME)
+ 	install -d $(DESTDIR)$(bindir)
+@@ -187,13 +187,9 @@
+ 	install -d $(DESTDIR)$(mandir)/man6
+ 	install -m644 man/man6/moagg.6 $(DESTDIR)$(mandir)/man6
  
+-install-data:
+-	install -d $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
+-	cp -r levels sound cfg gfx $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
+-
  #-----------------------------------------------------------------------------
 -.PHONY: uninstall uninstall-bin uninstall-man uninstall-doc uninstall-data
 -uninstall: uninstall-bin uninstall-man uninstall-doc uninstall-data
@@ -42,4 +49,14 @@
 +uninstall: uninstall-bin uninstall-man uninstall-doc 
  
  uninstall-bin:
- 	rm -f $(bindir)/moagg
+ 	rm -f $(DESTDIR)$(bindir)/moagg
+@@ -204,9 +200,6 @@
+ uninstall-man:
+ 	rm -f $(DESTDIR)$(mandir)/man6/moagg.6
+ 
+-uninstall-data:
+-	rm -rf $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
+-
+ #-----------------------------------------------------------------------------
+ ARCHIVEDIR = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+ 

Modified: packages/trunk/moagg/debian/patches/series
===================================================================
--- packages/trunk/moagg/debian/patches/series	2007-07-02 18:47:57 UTC (rev 3187)
+++ packages/trunk/moagg/debian/patches/series	2007-07-02 19:40:16 UTC (rev 3188)
@@ -1,2 +1,3 @@
 gcc-4.2.diff
 01_Makefile.in.diff
+fix-gcc-4.2-warn.diff