[Pkg-octave-commit] rev 421 - in trunk/packages/octplot/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-17 10:26:49 +0000 (Tue, 17 Jan 2006)
New Revision: 421

Removed:
   trunk/packages/octplot/debian/patches/ftgl-use-system-library.patch
Modified:
   trunk/packages/octplot/debian/changelog
   trunk/packages/octplot/debian/control
   trunk/packages/octplot/debian/rules
Log:
Gave up with building against ftgl-dev


Modified: trunk/packages/octplot/debian/changelog
===================================================================
--- trunk/packages/octplot/debian/changelog	2006-01-15 21:08:14 UTC (rev 420)
+++ trunk/packages/octplot/debian/changelog	2006-01-17 10:26:49 UTC (rev 421)
@@ -9,22 +9,16 @@
 
   +++ Changes by Rafael Laboissiere
 
-  * debian/patches/ftgl-use-system-library.patch: This patch changes the
-    upstream configure.in and src/Makefile.am to check for availability of
-    the FTGL library in the system.  This avoids the compilation of the
-    sources in the FTGL/ directory.
-  * debian/rules: Replace '-lftgl' with '-fpic -lftgl_pic' in src/Makefile.
-    This is necessary because src/octplot (which is dynamically loaded by
-    Octave) must be linked against PIC-compiled libraries.
-  * debian/control:
-    - Added ftgl-dev to Build-Depends
-    - Added libglu1-xorg-dev | libglu-dev to Build-Depends.  This should
-      have been the responsibility of ftgl-dev (see Bug#348200).
+  * Note for the ftp-master admins:  It has been suggested to us to
+    compiled the pacakge agaisnt the pre-packaged version of FTGL for
+    Debian (ftgl-dev).  We tried it, but the program crashes.
+    Investigating further the issue, we discovered that the upstream
+    author is shipping a different version of FTGL with the Octplot
+    sources, which may explain the problem.
 
-  * Hopefully this version will be approved by the ftp-admins and then it
-    will closes: #342264 
+  * Hopefully, this version will be approved this time (closes: #342264)
 
- -- 
+ --
 
 octplot (0.3.0-1) unstable; urgency=low
 

Modified: trunk/packages/octplot/debian/control
===================================================================
--- trunk/packages/octplot/debian/control	2006-01-15 21:08:14 UTC (rev 420)
+++ trunk/packages/octplot/debian/control	2006-01-17 10:26:49 UTC (rev 421)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends:  debhelper (>= 4.1.0), octave2.1-headers (>= 2.1.65), libfltk1.1-dev (>= 1.1.4), ftgl-dev, xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, cdbs
+Build-Depends:  debhelper (>= 4.1.0), octave2.1-headers (>= 2.1.65), libfltk1.1-dev (>= 1.1.4), xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, cdbs
 Standards-Version: 3.6.2
 
 Package: octplot

Deleted: trunk/packages/octplot/debian/patches/ftgl-use-system-library.patch

Modified: trunk/packages/octplot/debian/rules
===================================================================
--- trunk/packages/octplot/debian/rules	2006-01-15 21:08:14 UTC (rev 420)
+++ trunk/packages/octplot/debian/rules	2006-01-17 10:26:49 UTC (rev 421)
@@ -13,11 +13,6 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --with-opath=$(OCTDIR)
 CXXFLAGS += -fPIC
 
-build/octplot::
-	rm -f src/octplot
-	sed -ri 's/-lz -lftgl/-lz -fpic -lftgl_pic/' src/Makefile
-	$(MAKE)
-
 binary-predeb/octplot::
 	rm -f $(DEB_DESTDIR)$(OCTDIR)/fonts/copying