Bug#646464: (no subject)

2012-03-08 Thread Muammar El Khatib
Hi Barry,

On Thu, Feb 23, 2012 at 10:33:55AM -0500, Barry Warsaw wrote:
 Here's the patch I applied to Ubuntu to get this package to build from smc git
 head.

Thanks for the patch. I am waiting for the new version of CEGUI I have uploaded
(which I also used to test if the package was able to build) for then proceed to
upload smc.


Cheers,
--
Muammar El Khatib.
Linux user: 403107.
Key fingerprint = 90B8 BFC4 4A75 B881 39A3 1440 30EB 403B 1270 29F1
http://muammar.me | http://proyectociencia.org
  ,''`.
 : :' :
 `. `'
   `-



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#646464: (no subject)

2012-02-23 Thread Barry Warsaw
Here's the patch I applied to Ubuntu to get this package to build from smc git
head.

=== modified file 'debian/changelog'
--- debian/changelog2011-09-18 22:03:34 +
+++ debian/changelog2012-02-23 14:59:43 +
@@ -1,3 +1,19 @@
+smc (1.9+git20120222-0ubuntu1) precise; urgency=low
+
+  * New upstream snapshot.  Fixes FTBFS. (LP: #903126)
+- debian/control: Add libboost-thread-dev to B-D
+- debian/patches/01_configure.ac.patch: Search for boost_filesystem-mt
+  instead of boost_filesystem (as required by patch in previous Debian
+  version of the package).  Also search for boost_system so that this
+  library gets added to the linker line.
+- debian/patches: Remove as unnecessary 01_configure.patch,
+  02_binutils-gold.patch, 03_smc_boost1.46.patch
+- debian/rules: Add get-orig-source rule to check out smc from git.
+  Add post-patches rule to run autogen.sh after applying the
+  configure.ac patches.
+
+ -- Barry Warsaw ba...@ubuntu.com  Wed, 22 Feb 2012 17:14:50 -0500
+
 smc (1.9-4ubuntu1) oneiric; urgency=low
 
   * Update 02_binutils-gold.patch to properly use LDADD. Fixes FTBFS.

=== modified file 'debian/control'
--- debian/control  2011-09-18 22:03:34 +
+++ debian/control  2012-02-22 23:01:11 +
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
 XSBC-Original-Maintainer: Muammar El Khatib muam...@debian.org
-Build-Depends: cdbs, debhelper (= 6), autotools-dev, libcegui-mk2-dev (= 
0.6.2), libboost-filesystem-dev, libsdl1.2-dev, libsdl-image1.2-dev, 
libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, pkg-config, quilt (= 0.40), ttf-dejavu
+Build-Depends: cdbs, debhelper (= 6), autotools-dev, libcegui-mk2-dev (= 
0.6.2), libboost-filesystem-dev, libboost-thread-dev, libsdl1.2-dev, 
libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, pkg-config, quilt 
(= 0.40), ttf-dejavu
 Standards-Version: 3.9.1
 Homepage: http://www.secretmaryo.org
 

=== added file 'debian/patches/01_configure.ac.patch'
--- debian/patches/01_configure.ac.patch1970-01-01 00:00:00 +
+++ debian/patches/01_configure.ac.patch2012-02-23 14:43:19 +
@@ -0,0 +1,23 @@
+Author: Barry Warsaw ba...@ubuntu.com
+Description: A patch to change configure.ac file to recognize libboost.
+--- a/configure.ac
 b/configure.ac
+@@ -19,13 +19,17 @@
+ ### Check for libraries ###
+ 
+ # Check for the Boost Filesystem library
+-AC_CHECK_LIB([boost_filesystem], [main], ,
++AC_CHECK_LIB([boost_filesystem-mt], [main], ,
+   [AC_MSG_ERROR([Unable to find Boost Filesystem library])])
+ 
+ # Check for the Boost Thread library
+ AC_CHECK_LIB([boost_thread], [main], ,
+   [AC_MSG_ERROR([Unable to find Boost Thread library])])
+ 
++# Check for the Boost System library
++AC_CHECK_LIB([boost_system], [main], ,
++  [AC_MSG_ERROR([Unable to find Boost System library])])
++
+ # Check for the OpenGL and GLU library
+ case ${host} in
+ *darwin*|*macosx*)

=== removed file 'debian/patches/01_configure.patch'
--- debian/patches/01_configure.patch   2011-08-20 20:18:07 +
+++ debian/patches/01_configure.patch   1970-01-01 00:00:00 +
@@ -1,30 +0,0 @@
-Author: Joao Pinto joao.pi...@getdeb.net
-Description: A patch to change configure file to make recognize libboost.
 smc-1.9.orig/configure
-+++ smc-1.9/configure
-@@ -3377,13 +3377,13 @@
- # Check for the Boost Filesystem library
- 
- 
--{ $as_echo $as_me:$LINENO: checking for main in -lboost_filesystem 5
--$as_echo_n checking for main in -lboost_filesystem...  6; }
-+{ $as_echo $as_me:$LINENO: checking for main in -lboost_filesystem-mt 5
-+$as_echo_n checking for main in -lboost_filesystem-mt...  6; }
- if test ${ac_cv_lib_boost_filesystem_main+set} = set; then
-   $as_echo_n (cached)  6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS=-lboost_filesystem  $LIBS
-+LIBS=-lboost_filesystem-mt  $LIBS
- cat conftest.$ac_ext _ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3441,7 +3441,7 @@
- #define HAVE_LIBBOOST_FILESYSTEM 1
- _ACEOF
- 
--  LIBS=-lboost_filesystem $LIBS
-+  LIBS=-lboost_filesystem-mt $LIBS
- 
- else
-   { { $as_echo $as_me:$LINENO: error: Unable to find Boost Filesystem 
library 5

=== removed file 'debian/patches/02_binutils-gold.patch'
--- debian/patches/02_binutils-gold.patch   2011-09-18 22:03:34 +
+++ debian/patches/02_binutils-gold.patch   1970-01-01 00:00:00 +
@@ -1,13 +0,0 @@
-Index: smc-1.9/src/Makefile.in
-===
 smc-1.9.orig/src/Makefile.in   2011-09-18 22:02:04.0 -0400
-+++ smc-1.9/src/Makefile.in2011-09-18 22:03:01.0 -0400
-@@ -78,7 +78,7 @@
-   font.$(OBJEXT) gl_surface.$(OBJEXT) img_manager.$(OBJEXT) \
-   img_settings.$(OBJEXT) renderer.$(OBJEXT) video.$(OBJEXT)
- smc_OBJECTS = $(am_smc_OBJECTS)
--smc_LDADD = $(LDADD)
-+smc_LDADD = $(LDADD) -lX11 -lboost_system
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp =