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

[Rafael Laboissiere]

Author: rafael
Date: 2008-05-10 08:13:57 +0000 (Sat, 10 May 2008)
New Revision: 1837

Removed:
   octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff
Modified:
   octave-forge-pkgs/octave-fixed/trunk/debian/changelog
Log:
Drop patch shared-lib.diff

Modified: octave-forge-pkgs/octave-fixed/trunk/debian/changelog
===================================================================
--- octave-forge-pkgs/octave-fixed/trunk/debian/changelog	2008-05-10 08:11:29 UTC (rev 1836)
+++ octave-forge-pkgs/octave-fixed/trunk/debian/changelog	2008-05-10 08:13:57 UTC (rev 1837)
@@ -1,7 +1,8 @@
 octave-fixed (0.7.6-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * Drop patches pkg-add-autoloads.diff and mister-proper.diff (applied upstream)
+  * Drop patches pkg-add-autoloads.diff, mister-proper.diff and
+    shared-lib.diff (applied upstream)
 
  -- Ólafur Jens Sigurðsson <ojsbug at gmail.com>  Sun, 04 May 2008 15:46:45 +0200
 

Deleted: octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff
===================================================================
--- octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff	2008-05-10 08:11:29 UTC (rev 1836)
+++ octave-forge-pkgs/octave-fixed/trunk/debian/patches/shared-lib.diff	2008-05-10 08:13:57 UTC (rev 1837)
@@ -1,86 +0,0 @@
-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)