[Pkg-octave-commit] r1524 - in octave-forge-pkgs/octave-fixed/trunk/debian: . patches

Rafael Laboissiere rafael at alioth.debian.org
Thu Mar 27 17:12:28 UTC 2008


Author: rafael
Date: 2008-03-27 17:12:28 +0000 (Thu, 27 Mar 2008)
New Revision: 1524

Added:
   octave-forge-pkgs/octave-fixed/trunk/debian/patches/
   octave-forge-pkgs/octave-fixed/trunk/debian/patches/mister-proper.diff
   octave-forge-pkgs/octave-fixed/trunk/debian/patches/pkg-add-paths.diff
   octave-forge-pkgs/octave-fixed/trunk/debian/patches/series
   octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff
Log:
Add patches for making the pkg install correctly

Added: octave-forge-pkgs/octave-fixed/trunk/debian/patches/mister-proper.diff
===================================================================
--- octave-forge-pkgs/octave-fixed/trunk/debian/patches/mister-proper.diff	                        (rev 0)
+++ octave-forge-pkgs/octave-fixed/trunk/debian/patches/mister-proper.diff	2008-03-27 17:12:28 UTC (rev 1524)
@@ -0,0 +1,13 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile	2008-03-26 15:45:37.000000000 +0000
++++ trunk/src/Makefile	2008-03-26 15:45:57.000000000 +0000
+@@ -188,7 +188,7 @@
+ 
+ realclean:
+ 	@echo "Cleaning..."; \
+-	$(RM) -f $(DELETES)
++	$(RM) -f $(DELETES) Makeconf config.log config.status
+ 
+ dist:
+ 

Added: octave-forge-pkgs/octave-fixed/trunk/debian/patches/pkg-add-paths.diff
===================================================================
--- octave-forge-pkgs/octave-fixed/trunk/debian/patches/pkg-add-paths.diff	                        (rev 0)
+++ octave-forge-pkgs/octave-fixed/trunk/debian/patches/pkg-add-paths.diff	2008-03-27 17:12:28 UTC (rev 1524)
@@ -0,0 +1,10 @@
+Index: trunk/PKG_ADD
+===================================================================
+--- trunk.orig/PKG_ADD	2008-03-27 14:52:56.000000000 +0100
++++ trunk/PKG_ADD	2008-03-27 14:53:05.000000000 +0100
+@@ -1,3 +1,5 @@
++addpath (genpath ("/usr/lib/octave/3.0.0/oct"), "-begin");
++addpath (genpath ("/usr/share/octave/3.0.0/m"), "-begin");
+ autoload ("isfixed", fullfile (fileparts (mfilename ("fullpath")), "fixed.oct"));
+ autoload ("fabs", fullfile (fileparts (mfilename ("fullpath")), "fixed.oct"));
+ autoload ("fcos", fullfile (fileparts (mfilename ("fullpath")), "fixed.oct"));

Added: octave-forge-pkgs/octave-fixed/trunk/debian/patches/series
===================================================================
--- octave-forge-pkgs/octave-fixed/trunk/debian/patches/series	                        (rev 0)
+++ octave-forge-pkgs/octave-fixed/trunk/debian/patches/series	2008-03-27 17:12:28 UTC (rev 1524)
@@ -0,0 +1,3 @@
+pkg-add-paths.diff
+mister-proper.diff
+shared-lib.diff

Added: octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff
===================================================================
--- octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff	                        (rev 0)
+++ octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff	2008-03-27 17:12:28 UTC (rev 1524)
@@ -0,0 +1,86 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile	2008-03-27 15:33:26.000000000 +0100
++++ trunk/src/Makefile	2008-03-27 15:34:00.000000000 +0100
+@@ -3,31 +3,18 @@
+ FIXEDVERTARGET = fixedversion.h
+ FIXEDTARGET = fixed.oct 
+ 
+-LIBPRE = lib
+-LIBEXT = dll
+-LIBIMPEXT = dll.a
+ DLLDEF =
+ ifneq (,$(findstring cygwin,$(canonical_host_type)))
+-   OCT_INCLUDES_LIB = 1
+    DLLDEF = -DFIXED_DLL
+-   FIXEDIMPTARGET = $(LIBPRE)octave_fixed.$(LIBIMPEXT)
+-   ADD_FLAGS = -Wl,--out-implib=$(FIXEDIMPTARGET)
+ endif
+ ifneq (,$(findstring mingw,$(canonical_host_type)))
+-   OCT_INCLUDES_LIB = 1
+    DLLDEF = -DFIXED_DLL
+-   FIXEDIMPTARGET = $(LIBPRE)octave_fixed.$(LIBIMPEXT)
+-   ADD_FLAGS = -Wl,--out-implib=$(FIXEDIMPTARGET)
+ endif
+ ifneq (,$(findstring msdosmsvc,$(canonical_host_type)))
+-   OCT_INCLUDES_LIB = 1
+-   LIBPRE =
+-   LIBIMPEXT = lib
+    DLLDEF = -DFIXED_DLL
+ endif
+ 
+-ifeq (1,$(OCT_INCLUDES_LIB))
+-  FIXEDSOURCES = fixedColVector.cc fixedRowVector.cc \
++FIXEDSOURCES = fixedColVector.cc fixedRowVector.cc \
+ 	fixedMatrix.cc fixedComplex.cc fixedCColVector.cc fixedCRowVector.cc \
+ 	fixedCMatrix.cc Array-f.cc fixed-conv.cc ov-fixed.cc ov-fixed-mat.cc \
+ 	fixedNDArray.cc fixedCNDArray.cc \
+@@ -37,44 +24,11 @@
+ 	op-fcs-fs.cc  op-fcs-fm.cc  op-fcm-fs.cc  op-fcm-fm.cc \
+ 	op-fcs-fcs.cc op-fcs-fcm.cc op-fcm-fcs.cc op-fcm-fcm.cc \
+ 	fixed-var.cc fixed.cc
+-  FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES))
+-  FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES))
++FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES))
++FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES))
+ 
+-  TARGETS = $(FIXEDTARGET)
+-  OBJECTS = $(FIXEDOBJECTS)
+-
+-  EXTRALIBS =
+-else
+-  FIXEDLIBTARGET = $(LIBPRE)octave_fixed.$(LIBEXT)
+-  FIXEDIMPTARGET = $(FIXEDLIBTARGET:.$(LIBEXT)=.$(LIBIMPEXT))
+-  FIXEDLIBSOURCES = fixedColVector.cc fixedRowVector.cc \
+-	fixedMatrix.cc fixedComplex.cc fixedCColVector.cc fixedCRowVector.cc \
+-	fixedCMatrix.cc Array-f.cc fixed-conv.cc ov-fixed.cc ov-fixed-mat.cc \
+-	fixedNDArray.cc fixedCNDArray.cc \
+-	ov-fixed-complex.cc ov-fixed-cx-mat.cc \
+-	op-fs-fs.cc   op-fs-fm.cc   op-fm-fs.cc   op-fm-fm.cc \
+-	op-fs-fcs.cc  op-fs-fcm.cc  op-fm-fcs.cc  op-fm-fcm.cc \
+-	op-fcs-fs.cc  op-fcs-fm.cc  op-fcm-fs.cc  op-fcm-fm.cc \
+-	op-fcs-fcs.cc op-fcs-fcm.cc op-fcm-fcs.cc op-fcm-fcm.cc
+-  FIXEDLIBOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDLIBSOURCES))
+-  FIXEDLIBDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDLIBSOURCES))
+-
+-  FIXEDSOURCES = fixed.cc fixed-var.cc
+-  FIXEDOBJECTS = $(patsubst %.cc,%.o,$(FIXEDSOURCES))
+-  FIXEDDEPENDS = $(FIXEDLIBDEPENDS) $(patsubst %.cc,%.d,$(FIXEDSOURCES))
+-
+-  TARGETS = $(FIXEDLIBTARGET) $(FIXEDTARGET)
+-  OBJECTS = $(FIXEDLIBOBJECTS) $(FIXEDOBJECTS)
+-
+-  EXTRALIBS = -L./ -loctave_fixed
+-
+-  # The name of this flag changed in version 2.1.54. Use both versions
+-  # so that one of them will work.
+-  MY_SH_LDFLAGS = $(shell $(MKOCTFILE) -p SH_LDFLAGS) \
+-	-Wl,--out-implib=$(FIXEDIMPTARGET)
+-  MY_DL_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS) \
+-	-Wl,--out-implib=$(FIXEDIMPTARGET)
+-endif
++TARGETS = $(FIXEDTARGET)
++OBJECTS = $(FIXEDOBJECTS)
+ 
+ ifeq ($(MAKECMDGOALS),all)
+   DEPENDS = $(FIXEDDEPENDS)




More information about the Pkg-octave-commit mailing list