[Pkg-octave-commit] rev 420 - trunk/packages/octplot/debian

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-15 21:08:14 +0000 (Sun, 15 Jan 2006)
New Revision: 420

Modified:
   trunk/packages/octplot/debian/changelog
   trunk/packages/octplot/debian/rules
Log:
Preparation for release 0.3.0-2


Modified: trunk/packages/octplot/debian/changelog
===================================================================
--- trunk/packages/octplot/debian/changelog	2006-01-15 18:00:48 UTC (rev 419)
+++ trunk/packages/octplot/debian/changelog	2006-01-15 21:08:14 UTC (rev 420)
@@ -1,9 +1,9 @@
 octplot (0.3.0-2) unstable; urgency=low
 
   NOT YET RELEASED!
-   
+
   +++ Changes by Rafa Rodriguez Galvan
-  
+
   * debian/copyright: Added full copyright information, including
     additional copyright holders and different file licenses.
 
@@ -13,11 +13,17 @@
     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/control: 
+  * 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).
 
+  * Hopefully this version will be approved by the ftp-admins and then it
+    will closes: #342264 
+
  -- 
 
 octplot (0.3.0-1) unstable; urgency=low

Modified: trunk/packages/octplot/debian/rules
===================================================================
--- trunk/packages/octplot/debian/rules	2006-01-15 18:00:48 UTC (rev 419)
+++ trunk/packages/octplot/debian/rules	2006-01-15 21:08:14 UTC (rev 420)
@@ -10,9 +10,14 @@
 
 # Pass correct flags to configure script:
 DEB_CONFIGURE_EXTRA_FLAGS := --with-minpath=$(MDIR)
-DEB_CONFIGURE_EXTRA_FLAGS += --with-opath=$(OCTDIR) 
+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