Package: cytadela
Version: 1.0.1-1.1
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Add 01_fix_lib_order_for_linking.diff to resolve FTBFS.
(LP: #770900)
* debian/{control,rules}: Use dh-autoreconf
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru cytadela-1.0.1/debian/control cytadela-1.0.1/debian/control
--- cytadela-1.0.1/debian/control 2010-07-02 15:21:07.000000000 -0400
+++ cytadela-1.0.1/debian/control 2011-08-29 23:30:14.000000000 -0400
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <[email protected]>
Uploaders: Sylvain Beucler <[email protected]>
-Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 1.1)
+Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 1.1), dh-autoreconf
Standards-Version: 3.8.4
Homepage: http://cytadela.sf.net/
Vcs-Git: git://git.debian.org/git/pkg-games/cytadela.git
diff -Nru cytadela-1.0.1/debian/patches/01_fix_lib_order_for_linking.diff cytadela-1.0.1/debian/patches/01_fix_lib_order_for_linking.diff
--- cytadela-1.0.1/debian/patches/01_fix_lib_order_for_linking.diff 1969-12-31 19:00:00.000000000 -0500
+++ cytadela-1.0.1/debian/patches/01_fix_lib_order_for_linking.diff 2011-08-29 23:20:34.000000000 -0400
@@ -0,0 +1,11 @@
+Index: cytadela-1.0.1/src/Makefile.am
+===================================================================
+--- cytadela-1.0.1.orig/src/Makefile.am 2011-08-29 23:20:16.000000000 -0400
++++ cytadela-1.0.1/src/Makefile.am 2011-08-29 23:20:30.000000000 -0400
+@@ -9,5 +9,5 @@
+ CCytadelaMain.cpp CCytadelaMenu.cpp CytadelaSaveFile.cpp CInfoText.cpp \
+ COGLClass.cpp CSDLClass.cpp farread.cpp GameControl.cpp \
+ Localization.cpp UsableItem.cpp videoplayer.cpp main.cpp
+-cytadela_LDFLAGS = $(SDL_LIBS) -lGL -lGLU -lvlc
++cytadela_LDADD = $(SDL_LIBS) -lGL -lGLU -lvlc
+ DEFS = -DDATADIR=\"$(datadir)/cytadela\"
diff -Nru cytadela-1.0.1/debian/patches/series cytadela-1.0.1/debian/patches/series
--- cytadela-1.0.1/debian/patches/series 1969-12-31 19:00:00.000000000 -0500
+++ cytadela-1.0.1/debian/patches/series 2011-08-29 23:20:09.000000000 -0400
@@ -0,0 +1 @@
+01_fix_lib_order_for_linking.diff
diff -Nru cytadela-1.0.1/debian/rules cytadela-1.0.1/debian/rules
--- cytadela-1.0.1/debian/rules 2010-07-02 15:16:41.000000000 -0400
+++ cytadela-1.0.1/debian/rules 2011-08-29 23:14:50.000000000 -0400
@@ -18,7 +18,7 @@
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games
