tags 485798 + patch
tags 421560 + patch
tags 484190 + patch
usertag 485798 + proposed-patch
usertag 421560 + proposed-patch
usertag 484190 + proposed-patch
thanks

Hello!

I've updated Sam Hocevars NMU diff to include the RC fix suggested by
Peter Green and additionally added a small patch that replaces ftgl_pic
with ftgl for linking, to make things actually build. (See attachment)

I don't know enough about the program and how to properly test it, so I
don't feel comfortable uploading this just knowing that it builds now.
If someone can confirm that the program actually works properly after
this patch, please tell me!


-- 
Regards,
Andreas Henriksson
diff -u gem-0.90.0.1/debian/control gem-0.90.0.1/debian/control
--- gem-0.90.0.1/debian/control
+++ gem-0.90.0.1/debian/control
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Guenter Geiger (Debian/GNU) <[EMAIL PROTECTED]>
-Build-Depends: debhelper, cdbs, autoconf, puredata, libfreetype6-dev, ftgl-dev, libtiff4-dev, libjpeg62-dev, flex, libxxf86vm-dev, xlibmesa-gl-dev, zlib1g-dev (>= 1:1.1.3), pkg-config, libquicktime-dev, libmpeg3-dev, xlibs-static-dev, libpng12-dev, libdv-dev
+Build-Depends: debhelper, cdbs, autoconf, puredata, libfreetype6-dev, libftgl-dev, libtiff4-dev, libjpeg62-dev, flex, libxxf86vm-dev, xlibmesa-gl-dev, zlib1g-dev (>= 1:1.1.3), pkg-config, libquicktime-dev, libmpeg3-dev, libpng12-dev, libdv-dev
 Standards-Version: 3.7.2
 
 Package: gem
diff -u gem-0.90.0.1/debian/changelog gem-0.90.0.1/debian/changelog
--- gem-0.90.0.1/debian/changelog
+++ gem-0.90.0.1/debian/changelog
@@ -1,3 +1,20 @@
+gem (1:0.90.0.1-2.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Sam Hocevar ]
+  * Build-depend on libftgl-dev in order to use the shared version of the
+    library. (Closes: #485798)
+
+  [ Peter Green ]
+  * Spurious build-dependency xlibs-static-dev can simply be removed.
+    (Closes: #484190, #421560)
+
+  [ Andreas Henriksson ]
+  * Add debian/patches/06_ftgl.patch to link ftgl instead of ftgl_pic.
+
+ -- Andreas Henriksson <[EMAIL PROTECTED]>  Tue, 24 Jun 2008 22:04:29 +0200
+
 gem (1:0.90.0.1-2) unstable; urgency=low
 
   * Dropped kernel-headers build dependency (closes: 432546) (closes: 433276)
only in patch2:
unchanged:
--- gem-0.90.0.1.orig/debian/patches/06_ftgl.patch
+++ gem-0.90.0.1/debian/patches/06_ftgl.patch
@@ -0,0 +1,11 @@
+--- gem-0.90.0/src/Gnu/configure.ac.orig	2008-06-24 20:19:46.000000000 +0000
++++ gem-0.90.0/src/Gnu/configure.ac	2008-06-24 20:20:11.000000000 +0000
+@@ -65,7 +65,7 @@
+ AC_CHECK_LIB(dv,main) 
+ AC_CHECK_LIB(ftgl,main,
+   AC_DEFINE(HAVE_LIBFTGL)
+-  INCLUDES="$INCLUDES -I/usr/include/FTGL" && LIBS="-lftgl_pic $LIBS")
++  INCLUDES="$INCLUDES -I/usr/include/FTGL" && LIBS="-lftgl $LIBS")
+ 
+ AC_CHECK_LIB(vorbisenc, vorbis_encode_init)
+ AC_CHECK_LIB(vorbis, vorbis_info_init)

Reply via email to