[Pkg-jed-commit] r962 - in slxfig/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-11-09 00:23:50 +0000 (Fri, 09 Nov 2007)
New Revision: 962

Added:
   slxfig/trunk/debian/patches/
   slxfig/trunk/debian/patches/01-fake-feqs.patch
   slxfig/trunk/debian/patches/02-logic-operator.patch
Modified:
   slxfig/trunk/debian/changelog
   slxfig/trunk/debian/rules
Log:
* Added patches to make the package work with libslang 2.0, the version
  currently in Debian:
  + 01-fake-feqs: Simulate the call to feqs (which only exists in
    libslang 2.1)
  + 02-logic-operator: Replace the "&&" operator by a convoluted if/else
    code
* debian/rules: Set datarootdir when installing the package


Modified: slxfig/trunk/debian/changelog
===================================================================
--- slxfig/trunk/debian/changelog	2007-11-07 16:18:21 UTC (rev 961)
+++ slxfig/trunk/debian/changelog	2007-11-09 00:23:50 UTC (rev 962)
@@ -1,6 +1,12 @@
 slxfig (0~svn.192-1) UNRELEASED; urgency=low
 
   * New SVN upstream "release"
+  * Added patches to make the package work with libslang 2.0, the version
+    currently in Debian:
+    + 01-fake-feqs: Simulate the call to feqs (which only exists in
+      libslang 2.1)
+    + 02-logic-operator: Replace the "&&" operator by a convoluted if/else
+      code
   * debian/control:
     + Added Homepage field
     + Use the now official Vcs-* fields instead of the obsolete XS-Vcs-*
@@ -8,7 +14,9 @@
   * debian/watch: Added file
   * debian/slxfig.php: Script PHP used for faking an usptream URL whichs
     gives the latest SVN revision of the upstream repository
-  * debian/rules: Install uscan script at people.debian.org
+  * debian/rules:
+    + Install uscan script at people.debian.org
+    + Set datarootdir when installing the package
 
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 07 Nov 2007 16:34:13 +0100
 

Added: slxfig/trunk/debian/patches/01-fake-feqs.patch
===================================================================
--- slxfig/trunk/debian/patches/01-fake-feqs.patch	                        (rev 0)
+++ slxfig/trunk/debian/patches/01-fake-feqs.patch	2007-11-09 00:23:50 UTC (rev 962)
@@ -0,0 +1,22 @@
+--- slxfig-0~svn.192.orig/src/xfig/plot.sl
++++ slxfig-0~svn.192/src/xfig/plot.sl
+@@ -5,6 +5,10 @@
+ 
+ private variable ERRBAR_TERMINAL_SIZE = 0.1;
+ 
++static variable eps = 1.0;
++while (1 + eps/2.0 != 1)
++  eps /= 2.0;
++
+ #iffalse
+ define xfig_new_plot2d_axes (dx, dy, xlabel, ylabel)
+ {
+@@ -187,7 +191,7 @@
+    if (islog)
+      {
+ 	% For a log axis, only integer valued major tics are meaningful
+-	ti = ti[where (feqs (ti, int(ti)))];
++	ti = ti[where (abs (ti - int(ti)) < eps)];
+      }
+ 
+    return ti, num_minor[n];

Added: slxfig/trunk/debian/patches/02-logic-operator.patch
===================================================================
--- slxfig/trunk/debian/patches/02-logic-operator.patch	                        (rev 0)
+++ slxfig/trunk/debian/patches/02-logic-operator.patch	2007-11-09 00:23:50 UTC (rev 962)
@@ -0,0 +1,19 @@
+--- slxfig-0~svn.192.orig/src/xfig/plot.sl
++++ slxfig-0~svn.192/src/xfig/plot.sl
+@@ -718,13 +718,15 @@
+    variable j = [1:num_minor];
+    variable i = j-1;
+ 
+-   if (islog && (num_minor == 0))
++   if (islog) 
++     if (num_minor == 0)
+      {
+ 	num_minor = 8;
+ 	i = [0:num_minor-1];
+ 	j = log10 ([2:9]);	       %  log10([2:9])
+ 	minor_tic_interval = 1.0;
+      }
++     else minor_tic_interval = major_tic_interval/(num_minor+1.0);     
+    else minor_tic_interval = major_tic_interval/(num_minor+1.0);
+ 
+    variable minor_tics = Double_Type[num_minor*length(major_tics)];

Modified: slxfig/trunk/debian/rules
===================================================================
--- slxfig/trunk/debian/rules	2007-11-07 16:18:21 UTC (rev 961)
+++ slxfig/trunk/debian/rules	2007-11-09 00:23:50 UTC (rev 962)
@@ -2,8 +2,11 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_MAKE_BUILD_TARGET := all RPATH=
+DEB_MAKE_INSTALL_TARGET := install datarootdir=/usr/share	\
+			   DESTDIR=$(DEB_DESTDIR)
 
 pkg = slxfig
 ver = 0