X-Git-Url: http://git.pld-linux.org/?p=packages%2FCOLAMD.git;a=blobdiff_plain;f=colamd-ufconfig.patch;fp=colamd-ufconfig.patch;h=faa98521a7b38c7340ec97939414957ac9c1d98f;hp=acc98e41ba57423cb142836b1394ae6afb0bb63e;hb=e0318b644409b85b39170e665a5ab9a45fabcad8;hpb=6e77168e64b55f0133135c3f16f05d38235e6f0e

diff --git a/colamd-ufconfig.patch b/colamd-ufconfig.patch
index acc98e4..faa9852 100644
--- a/colamd-ufconfig.patch
+++ b/colamd-ufconfig.patch
@@ -1,44 +1,22 @@
---- COLAMD/Source/colamd.c~	2006-12-13 13:46:38.000000000 +0200
-+++ COLAMD/Source/colamd.c	2007-03-27 01:17:49.118259378 +0300
-@@ -685,7 +685,7 @@
+--- COLAMD/Include/colamd.h.orig	2012-05-29 17:03:28.000000000 +0200
++++ COLAMD/Include/colamd.h	2012-06-27 17:10:19.412091279 +0200
+@@ -135,7 +135,7 @@
+ /* === Prototypes of user-callable routines ================================= */
  /* ========================================================================== */
  
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- #ifdef DLONG
- 
---- COLAMD/Include/colamd.h~	2006-12-13 13:46:09.000000000 +0200
-+++ COLAMD/Include/colamd.h	2007-03-27 01:18:06.598650636 +0300
-@@ -139,7 +139,7 @@
- /* ========================================================================== */
- 
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
  
  size_t colamd_recommended	/* returns recommended value of Alen, */
  				/* or 0 if input arguments are erroneous */
---- COLAMD/Demo/colamd_l_example.c~	2006-12-13 13:47:22.000000000 +0200
-+++ COLAMD/Demo/colamd_l_example.c	2007-03-27 01:18:17.698899095 +0300
-@@ -44,7 +44,7 @@
- #define B_N 5
- 
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
- 
- int main (void)
- {
 --- COLAMD/Makefile~	2007-03-27 01:18:43.219470348 +0300
 +++ COLAMD/Makefile	2007-03-27 01:18:44.569500568 +0300
 @@ -1,7 +1,7 @@
  
  default: demo
  
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  # Compile all C code, including the C-callable routine and the mexFunctions.
  # Do not the MATLAB interface.
@@ -49,10 +27,10 @@ diff -ur COLAMD/Demo/Makefile COLAMD.UF/Demo/Makefile
  
  default: colamd_example colamd_l_example
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--I = -I../Include -I../../UFconfig
+-I = -I../Include -I../../SuiteSparse_config
 +I = -I../Include
  
  C = $(CC) $(CFLAGS) $(I)
@@ -64,31 +42,13 @@ diff -ur COLAMD/Lib/Makefile COLAMD.UF/Lib/Makefile
  
  default: libcolamd.a
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
- 
--I = -I../Include -I../../UFconfig
-+I = -I../Include
- 
--INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
-+INC = ../Include/colamd.h
- 
- SRC = ../Source/colamd.c ../Source/colamd_global.c
- 
-diff -ur COLAMD/MATLAB/Makefile COLAMD.UF/MATLAB/Makefile
---- COLAMD/MATLAB/Makefile	2007-05-06 04:41:53.000000000 +0200
-+++ COLAMD.UF/MATLAB/Makefile	2007-12-02 15:42:15.000000000 +0100
-@@ -2,11 +2,11 @@
- 
- default: colamd2 symamd2
- 
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--I = -I../../UFconfig -I../Include
+-I = -I../Include -I../../SuiteSparse_config
 +I = -I../Include
  
--INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
+-INC = ../Include/colamd.h ../../SuiteSparse_config/SuiteSparse_config.h
 +INC = ../Include/colamd.h
  
  SRC = ../Source/colamd.c ../Source/colamd_global.c