[SCM] Debian packaging for suitesparse branch, master, updated. upstream/4.2.0-25-g170c1ce

Sébastien Villemot sebastien at debian.org
Mon Apr 29 14:52:07 UTC 2013 

The following commit has been merged in the master branch:
commit 231d240435ac9a75ba26319cf6852b1c68863152
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Apr 29 16:09:02 2013 +0200

    Cleanup of patches names, order and headers

diff --git a/debian/patches/01-Makefile.diff b/debian/patches/01-Makefile.diff
deleted file mode 100644
index 097062c..0000000
--- a/debian/patches/01-Makefile.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Build CCOLAMD as well
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
-diff -u upstrm/Makefile debsrc/Makefile
---- upstrm/Makefile	2007-10-29 21:02:03.000000000 +0100
-+++ debsrc/Makefile	2007-12-15 17:19:19.000000000 +0100
-@@ -10,11 +10,11 @@
- #	( cd metis-4.0 ; $(MAKE) )
- 	( cd AMD ; $(MAKE) )
- 	( cd CAMD ; $(MAKE) )
-+	( cd CCOLAMD ; $(MAKE) )
- 	( cd COLAMD ; $(MAKE) )
- 	( cd BTF ; $(MAKE) )
- 	( cd KLU ; $(MAKE) )
- 	( cd LDL ; $(MAKE) )
--	( cd CCOLAMD ; $(MAKE) )
- 	( cd UMFPACK ; $(MAKE) )
- 	( cd CHOLMOD ; $(MAKE) )
- 	( cd CSparse ; $(MAKE) )
diff --git a/debian/patches/02-AMD_Lib_GNUmakefile.diff b/debian/patches/AMD_Lib_GNUmakefile.diff
similarity index 83%
rename from debian/patches/02-AMD_Lib_GNUmakefile.diff
rename to debian/patches/AMD_Lib_GNUmakefile.diff
index 919c834..5bd0bc1 100644
--- a/debian/patches/02-AMD_Lib_GNUmakefile.diff
+++ b/debian/patches/AMD_Lib_GNUmakefile.diff
@@ -1,11 +1,9 @@
-Build shared version of AMD library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
-Index: suitesparse-4.0.2/AMD/Lib/GNUmakefile
-===================================================================
---- suitesparse-4.0.2.orig/AMD/Lib/GNUmakefile	2012-09-10 21:07:10.732284031 +0200
-+++ suitesparse-4.0.2/AMD/Lib/GNUmakefile	2012-09-10 21:10:58.320274459 +0200
+Description: Build shared version of AMD library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/AMD/Lib/GNUmakefile
++++ b/AMD/Lib/GNUmakefile
 @@ -2,7 +2,9 @@
  # AMD Makefile for compiling on Unix systems (for GNU make only)
  #-------------------------------------------------------------------------------
diff --git a/debian/patches/06-BTF_Lib_Makefile.diff b/debian/patches/BTF_Lib_Makefile.diff
similarity index 91%
rename from debian/patches/06-BTF_Lib_Makefile.diff
rename to debian/patches/BTF_Lib_Makefile.diff
index b564e98..0bee8ca 100644
--- a/debian/patches/06-BTF_Lib_Makefile.diff
+++ b/debian/patches/BTF_Lib_Makefile.diff
@@ -1,7 +1,7 @@
-Build shared version of BTF library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of BTF library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/BTF/Lib/Makefile
 +++ b/BTF/Lib/Makefile
 @@ -15,38 +15,58 @@
diff --git a/debian/patches/03-CAMD_Lib_GNUmakefile.diff b/debian/patches/CAMD_Lib_GNUmakefile.diff
similarity index 83%
rename from debian/patches/03-CAMD_Lib_GNUmakefile.diff
rename to debian/patches/CAMD_Lib_GNUmakefile.diff
index 14ea9b8..e59d02d 100644
--- a/debian/patches/03-CAMD_Lib_GNUmakefile.diff
+++ b/debian/patches/CAMD_Lib_GNUmakefile.diff
@@ -1,11 +1,9 @@
-Build shared version of CAMD library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
-Index: suitesparse-4.0.2/CAMD/Lib/GNUmakefile
-===================================================================
---- suitesparse-4.0.2.orig/CAMD/Lib/GNUmakefile	2012-09-10 21:21:09.596248752 +0200
-+++ suitesparse-4.0.2/CAMD/Lib/GNUmakefile	2012-09-10 21:21:22.952248191 +0200
+Description: Build shared version of CAMD library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CAMD/Lib/GNUmakefile
++++ b/CAMD/Lib/GNUmakefile
 @@ -2,7 +2,9 @@
  # CAMD Makefile for compiling on Unix systems (for GNU make only)
  #-------------------------------------------------------------------------------
diff --git a/debian/patches/04-CCOLAMD_Lib_Makefile.diff b/debian/patches/CCOLAMD_Lib_Makefile.diff
similarity index 84%
rename from debian/patches/04-CCOLAMD_Lib_Makefile.diff
rename to debian/patches/CCOLAMD_Lib_Makefile.diff
index 1197e39..a98bed1 100644
--- a/debian/patches/04-CCOLAMD_Lib_Makefile.diff
+++ b/debian/patches/CCOLAMD_Lib_Makefile.diff
@@ -1,7 +1,7 @@
-Build shared version of CCOLAMD library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of CCOLAMD library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CCOLAMD/Lib/Makefile
 +++ b/CCOLAMD/Lib/Makefile
 @@ -2,7 +2,9 @@
diff --git a/debian/patches/12-CHOLMOD_Lib_Makefile.diff b/debian/patches/CHOLMOD_Lib_Makefile.diff
similarity index 99%
rename from debian/patches/12-CHOLMOD_Lib_Makefile.diff
rename to debian/patches/CHOLMOD_Lib_Makefile.diff
index 7d83217..c0f098c 100644
--- a/debian/patches/12-CHOLMOD_Lib_Makefile.diff
+++ b/debian/patches/CHOLMOD_Lib_Makefile.diff
@@ -1,7 +1,7 @@
-Build shared version of CHOLMOD library.
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of CHOLMOD library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CHOLMOD/Lib/Makefile
 +++ b/CHOLMOD/Lib/Makefile
 @@ -50,7 +50,9 @@
diff --git a/debian/patches/05-COLAMD_Lib_Makefile.diff b/debian/patches/COLAMD_Lib_Makefile.diff
similarity index 84%
rename from debian/patches/05-COLAMD_Lib_Makefile.diff
rename to debian/patches/COLAMD_Lib_Makefile.diff
index 7b13e68..bd09515 100644
--- a/debian/patches/05-COLAMD_Lib_Makefile.diff
+++ b/debian/patches/COLAMD_Lib_Makefile.diff
@@ -1,7 +1,7 @@
-Build shared version of COLAMD library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of COLAMD library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/COLAMD/Lib/Makefile
 +++ b/COLAMD/Lib/Makefile
 @@ -2,7 +2,9 @@
diff --git a/debian/patches/09-CSparse_Lib_Makefile.diff b/debian/patches/CSparse_Lib_Makefile.diff
similarity index 87%
rename from debian/patches/09-CSparse_Lib_Makefile.diff
rename to debian/patches/CSparse_Lib_Makefile.diff
index 5bc0146..fb46bb1 100644
--- a/debian/patches/09-CSparse_Lib_Makefile.diff
+++ b/debian/patches/CSparse_Lib_Makefile.diff
@@ -1,7 +1,7 @@
-Build shared version of CSparse library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of CSparse library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CSparse/Lib/Makefile
 +++ b/CSparse/Lib/Makefile
 @@ -3,7 +3,11 @@
diff --git a/debian/patches/10-CXSparse_Lib_Makefile.diff b/debian/patches/CXSparse_Lib_Makefile.diff
similarity index 88%
rename from debian/patches/10-CXSparse_Lib_Makefile.diff
rename to debian/patches/CXSparse_Lib_Makefile.diff
index 569487f..7c9618b 100644
--- a/debian/patches/10-CXSparse_Lib_Makefile.diff
+++ b/debian/patches/CXSparse_Lib_Makefile.diff
@@ -1,11 +1,9 @@
-Build shared version of CXSparse library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
-Index: suitesparse-4.0.2/CXSparse/Lib/Makefile
-===================================================================
---- suitesparse-4.0.2.orig/CXSparse/Lib/Makefile	2012-09-11 13:37:44.000000000 +0200
-+++ suitesparse-4.0.2/CXSparse/Lib/Makefile	2012-09-11 13:48:58.060697752 +0200
+Description: Build shared version of CXSparse library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CXSparse/Lib/Makefile
++++ b/CXSparse/Lib/Makefile
 @@ -7,7 +7,9 @@
  
  I = -I../../SuiteSparse_config -I../Include
diff --git a/debian/patches/07-KLU_Lib_Makefile.diff b/debian/patches/KLU_Lib_Makefile.diff
similarity index 96%
rename from debian/patches/07-KLU_Lib_Makefile.diff
rename to debian/patches/KLU_Lib_Makefile.diff
index 4d85efe..8afcafd 100644
--- a/debian/patches/07-KLU_Lib_Makefile.diff
+++ b/debian/patches/KLU_Lib_Makefile.diff
@@ -1,11 +1,9 @@
-Build shared version of KLU library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
-Index: suitesparse-4.0.2/KLU/Lib/Makefile
-===================================================================
---- suitesparse-4.0.2.orig/KLU/Lib/Makefile	2012-09-11 13:50:09.000000000 +0200
-+++ suitesparse-4.0.2/KLU/Lib/Makefile	2012-09-11 14:01:54.260729931 +0200
+Description: Build shared version of KLU library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/KLU/Lib/Makefile
++++ b/KLU/Lib/Makefile
 @@ -17,132 +17,202 @@
  
  all: library
diff --git a/debian/patches/08-LDL_Lib_Makefile.diff b/debian/patches/LDL_Lib_Makefile.diff
similarity index 81%
rename from debian/patches/08-LDL_Lib_Makefile.diff
rename to debian/patches/LDL_Lib_Makefile.diff
index 2b04597..4456561 100644
--- a/debian/patches/08-LDL_Lib_Makefile.diff
+++ b/debian/patches/LDL_Lib_Makefile.diff
@@ -1,7 +1,7 @@
-Build shared version of LDL library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of LDL library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/LDL/Lib/Makefile
 +++ b/LDL/Lib/Makefile
 @@ -10,7 +10,9 @@
diff --git a/debian/patches/SPQR_Lib_Makefile.diff b/debian/patches/SPQR_Lib_Makefile.diff
index 5e6d79e..80d336e 100644
--- a/debian/patches/SPQR_Lib_Makefile.diff
+++ b/debian/patches/SPQR_Lib_Makefile.diff
@@ -1,13 +1,5 @@
-Description: <short description, required>
- <long description that can span multiple lines, optional>
-Author: <name and email of author, optional>
-Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
-Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
-Bug-<Vendor>: <URL to the vendor bug report if any, optional>
-Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
-Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
-Reviewed-by: <name and email of a reviewer, optional>
-Last-Update: <YYYY-MM-DD, last update of the meta-information, optional>
+Description: Build shared version of SPQR library
+Author: Sébastien Villemot <sebastien at debian.org>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/SPQR/Lib/Makefile
diff --git a/debian/patches/13-UFconfig_UFconfig.mk.diff b/debian/patches/SuiteSparse_config_SuiteSparse_config_mk.diff
similarity index 84%
rename from debian/patches/13-UFconfig_UFconfig.mk.diff
rename to debian/patches/SuiteSparse_config_SuiteSparse_config_mk.diff
index 0d2e002..5295e07 100644
--- a/debian/patches/13-UFconfig_UFconfig.mk.diff
+++ b/debian/patches/SuiteSparse_config_SuiteSparse_config_mk.diff
@@ -1,9 +1,9 @@
-* Do not use metis library
-* Drop the fortran libraries from linking options
-* Link against lapack library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Customize the package configuration
+ - Do not use metis library
+ - Drop the fortran libraries from linking options
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/SuiteSparse_config/SuiteSparse_config.mk
 +++ b/SuiteSparse_config/SuiteSparse_config.mk
 @@ -106,7 +106,7 @@
diff --git a/debian/patches/11-UMFPACK_Lib_GNUmakefile.diff b/debian/patches/UMFPACK_Lib_GNUmakefile.diff
similarity index 98%
rename from debian/patches/11-UMFPACK_Lib_GNUmakefile.diff
rename to debian/patches/UMFPACK_Lib_GNUmakefile.diff
index daac4df..85a7c38 100644
--- a/debian/patches/11-UMFPACK_Lib_GNUmakefile.diff
+++ b/debian/patches/UMFPACK_Lib_GNUmakefile.diff
@@ -1,7 +1,7 @@
-Build shared version of UMFPACK library
-
- -- Daniel Rus Morales <danirus at tol-project.org>  Tue, 17 Jul 2007 12:15:41 +0200
-
+Description: Build shared version of UMFPACK library
+Author: Daniel Rus Morales <danirus at tol-project.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/UMFPACK/Lib/GNUmakefile
 +++ b/UMFPACK/Lib/GNUmakefile
 @@ -2,7 +2,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index a4df113..5f67e67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,20 @@
-#01-Makefile.diff
-02-AMD_Lib_GNUmakefile.diff
-03-CAMD_Lib_GNUmakefile.diff
-04-CCOLAMD_Lib_Makefile.diff
-05-COLAMD_Lib_Makefile.diff
-06-BTF_Lib_Makefile.diff
-07-KLU_Lib_Makefile.diff
-08-LDL_Lib_Makefile.diff
-09-CSparse_Lib_Makefile.diff
-10-CXSparse_Lib_Makefile.diff
-11-UMFPACK_Lib_GNUmakefile.diff
-12-CHOLMOD_Lib_Makefile.diff
-13-UFconfig_UFconfig.mk.diff
+SuiteSparse_config_SuiteSparse_config_mk.diff
+AMD_Lib_GNUmakefile.diff
+CAMD_Lib_GNUmakefile.diff
+CCOLAMD_Lib_Makefile.diff
+COLAMD_Lib_Makefile.diff
+BTF_Lib_Makefile.diff
+KLU_Lib_Makefile.diff
+LDL_Lib_Makefile.diff
+CSparse_Lib_Makefile.diff
+CXSparse_Lib_Makefile.diff
+UMFPACK_Lib_GNUmakefile.diff
+CHOLMOD_Lib_Makefile.diff
+SPQR_Lib_Makefile.diff
+Suitesparse_config_Makefile.diff
+KLU_Demo_Makefile.diff
 buildflags.diff
 parallel-build.diff
-KLU_Demo_Makefile.diff
-Suitesparse_config_Makefile.diff
-SPQR_Lib_Makefile.diff
+
+
+

-- 
Debian packaging for suitesparse

More information about the debian-science-commits mailing list