r14086 - in packages/trunk/adonthell/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2013-05-19 15:54:01 +0000 (Sun, 19 May 2013)
New Revision: 14086

Added:
   packages/trunk/adonthell/debian/adonthell.desktop
   packages/trunk/adonthell/debian/patches/12_no_sparc_bytecompile.patch
Modified:
   packages/trunk/adonthell/debian/changelog
   packages/trunk/adonthell/debian/patches/series
Log:
Integrate NMU and add desktop file

Added: packages/trunk/adonthell/debian/adonthell.desktop
===================================================================
--- packages/trunk/adonthell/debian/adonthell.desktop	                        (rev 0)
+++ packages/trunk/adonthell/debian/adonthell.desktop	2013-05-19 15:54:01 UTC (rev 14086)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Adonthell
+Comment=A 2D RPG Engine
+Exec=/usr/games/adonthell
+Icon=
+Terminal=false
+Type=Application
+Categories=Game;RolePlaying;

Modified: packages/trunk/adonthell/debian/changelog
===================================================================
--- packages/trunk/adonthell/debian/changelog	2013-05-19 14:51:38 UTC (rev 14085)
+++ packages/trunk/adonthell/debian/changelog	2013-05-19 15:54:01 UTC (rev 14086)
@@ -1,3 +1,21 @@
+adonthell (0.3.5-8) UNRELEASED; urgency=low
+
+  * Acknowledge NMU.
+  * Add .desktop file. (Closes: #708933).
+
+ -- Barry deFreese <bdefreese at debian.org>  Sun, 19 May 2013 07:07:29 -0400
+
+adonthell (0.3.5-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/12_no_sparc_bytecompile.patch:
+    - Do not bytecompile Python files during build on sparc, workaround
+      to let adonthell compile again. Generated files were not installed
+      in the package, and byte-compilation is performed at a later stage
+      by python-support anyway (Closes: #639450).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 02 Oct 2011 17:21:03 +0200
+
 adonthell (0.3.5-7) unstable; urgency=low
 
   * Team upload.

Added: packages/trunk/adonthell/debian/patches/12_no_sparc_bytecompile.patch
===================================================================
--- packages/trunk/adonthell/debian/patches/12_no_sparc_bytecompile.patch	                        (rev 0)
+++ packages/trunk/adonthell/debian/patches/12_no_sparc_bytecompile.patch	2013-05-19 15:54:01 UTC (rev 14086)
@@ -0,0 +1,29 @@
+Description: Do not bytecompile Python files during build
+Author: Luca Falavigna <dktrkranz at debian.org>
+Bug-Debian: http://bugs.debian.org/639450
+Forwarded: no
+
+Index: adonthell-0.3.5/src/modules/Makefile.in
+===================================================================
+--- adonthell-0.3.5.orig/src/modules/Makefile.in	2011-10-02 17:20:09.885955991 +0200
++++ adonthell-0.3.5/src/modules/Makefile.in	2011-10-02 17:20:44.365957048 +0200
+@@ -216,6 +216,10 @@
+ CLEANFILES = $(pyc_files)
+ all: all-am
+ 
++ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),sparc)
++        ADONTHELLCMD=$(top_builddir)/src/adonthell-0.3 -c
++endif
++
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+@@ -404,7 +408,7 @@
+ 
+ 
+ all: $(py_files) 
+-	$(top_builddir)/src/adonthell-0.3 -c
++	$(ADONTHELLCMD)
+ 
+ %.pyc : %.py
+ 	@if test x$(top_srcdir) != x$(top_builddir) ; then \

Modified: packages/trunk/adonthell/debian/patches/series
===================================================================
--- packages/trunk/adonthell/debian/patches/series	2013-05-19 14:51:38 UTC (rev 14085)
+++ packages/trunk/adonthell/debian/patches/series	2013-05-19 15:54:01 UTC (rev 14086)
@@ -1,3 +1,4 @@
 04_do_not_ship_pyc.diff
 10_ftbfs_with_gcc-4.4.diff
 11_ftbfs_with_gcc-4.6.diff
+12_no_sparc_bytecompile.patch