[med-svn] [Git][med-team/igraph][master] Debian patch 0.9.5+ds-3

Tue Jan 4 20:48:43 GMT 2022


Jérôme Benoit pushed to branch master at Debian Med / igraph


Commits:
a7bb490d by Jerome Benoit at 2022-01-04T21:46:49+01:00
Debian patch 0.9.5+ds-3

- - - - -


6 changed files:

- debian/adhoc/examples/benchmarks/Makefile
- debian/adhoc/examples/simple/Makefile
- debian/adhoc/examples/tutorial/Makefile
- debian/changelog
- debian/copyright
- debian/patches/upstream-external-plfit.patch


Changes:

=====================================
debian/adhoc/examples/benchmarks/Makefile
=====================================
@@ -16,7 +16,7 @@
 #
 # written for Debian by Jerome Benoit <calculus at rezozer.net>
 # on behalf of the Debian Med Packaging Team
-# copyright: 2020-2021 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2020-2022 Jerome Benoit <calculus at rezozer.net>
 # distributed under the terms and conditions of GPL version 2 or later
 #
 


=====================================
debian/adhoc/examples/simple/Makefile
=====================================
@@ -16,7 +16,7 @@
 #
 # written for Debian by Jerome Benoit <calculus at rezozer.net>
 # on behalf of the Debian Med Packaging Team
-# copyright: 2020-2021 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2020-2022 Jerome Benoit <calculus at rezozer.net>
 # distributed under the terms and conditions of GPL version 2 or later
 #
 


=====================================
debian/adhoc/examples/tutorial/Makefile
=====================================
@@ -16,7 +16,7 @@
 #
 # written for Debian by Jerome Benoit <calculus at rezozer.net>
 # on behalf of the Debian Med Packaging Team
-# copyright: 2021 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2021-2022 Jerome Benoit <calculus at rezozer.net>
 # distributed under the terms and conditions of GPL version 2 or later
 #
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+igraph (0.9.5+ds-3) unstable; urgency=medium
+
+  * Debianization:
+    - d/copyright, update copyright year tuples;
+    - d/adhoc/examples/*/Makfile, idem;
+    - d/patches/*:
+      - d/p/upstream-external-plfit.patch, refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Tue, 04 Jan 2022 20:46:03 +0000
+
 igraph (0.9.5+ds-2) unstable; urgency=medium
 
   * Fix watchfile (comment) to detect new versions on github


=====================================
debian/copyright
=====================================
@@ -15,7 +15,7 @@ Files-Excluded:
 
 Files: *
 Copyright:
- 2005-2021 The igraph development team:
+ 2005-2022 The igraph development team:
   Gabor Csardi <csardi.gabor at gmail.com>,
   Tamas Nepusz <ntamas at gmail.com>,
   Szabolcs Horvat <szhorvat at gmail.com>,
@@ -30,7 +30,7 @@ License: GPL-2+
 Files:
  src/isomorphism/bliss/*.hh
  src/isomorphism/bliss/*.cc
-Copyright: 2003-2021 Tommi Junttila
+Copyright: 2003-2022 Tommi Junttila
 License: LGPL-3
 
 Files: src/layout/drl/*
@@ -141,7 +141,7 @@ Comment:
  Adapted by Tamas Nepusz
 
 Files: etc/cmake/FindARPACK.cmake
-Copyright: 2004-2021 The DUNE development team
+Copyright: 2004-2022 The DUNE development team
 License: GPL-2
 Comment:
  Retrieved from https://github.com/dune-project/dune-istl/
@@ -161,7 +161,7 @@ Comment:
 Files: doc/*
 Copyright:
  2005-2019 Gabor Csardi and Tamas Nepusz
- 2020-2021 The igraph development team:
+ 2020-2022 The igraph development team:
   Gabor Csardi,
   Tamas Nepusz,
   Szabolcs Horvat,
@@ -173,7 +173,7 @@ Files: debian/*
 Copyright:
  2009-2012 Mathieu Malaterre <malat at debian.org>
  2013-2020 Andreas Tille <tille at debian.org>
- 2021 Jerome Benoit <calculus at debian.org>
+ 2021-2022 Jerome Benoit <calculus at debian.org>
 License: GPL-2+
 
 License: Apache-2.0


=====================================
debian/patches/upstream-external-plfit.patch
=====================================
@@ -12,14 +12,14 @@ Description: upstream: (ad hoc) non-internal support: plfit
 Origin: debian
 Forwarded: WIP
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2021-11-14
+Last-Update: 2022-01-04
 
 --- /dev/null
 +++ b/etc/cmake/FindPLFIT.cmake
 @@ -0,0 +1,32 @@
 +# Inspired by http://code.google.com/p/origin/source/browse/trunk/cmake/FindGMP.cmake
 +
-+# Copyright (c) 2021 Tamas Nepusz
++# Copyright (c) 2022 Tamas Nepusz
 +#
 +# This file is distributed under the MIT License. See
 +# http://www.opensource.org/licenses/mit-license.php for terms and conditions.
@@ -29,7 +29,7 @@ Last-Update: 2021-11-14
 +
 +set(PLFIT_PREFIX "" CACHE PATH "Path to PLFIT prefix")
 +
-+find_path(PLFIT_INCLUDE_DIR plfit.h PATHS ${PLFIT_PREFIX}/include /usr/include /usr/local/include)
++find_path(PLFIT_INCLUDE_DIR plfit.h PATHS ${PLFIT_PREFIX}/include/plfit /usr/include/plfit /usr/local/include/plfit)
 +find_library(PLFIT_LIBRARY plfit PATHS ${PLFIT_PREFIX}/lib /usr/lib /usr/local/lib)
 +
 +# behave like a CMake module is supposed to behave
@@ -107,6 +107,17 @@ Last-Update: 2021-11-14
  if(NOT IGRAPH_USE_INTERNAL_GMP)
    set(PKGCONFIG_LIBS_PRIVATE "${PKGCONFIG_LIBS_PRIVATE} -lgmp")
  endif()
+--- a/tests/benchmarks/igraph_power_law_fit.c
++++ b/tests/benchmarks/igraph_power_law_fit.c
+@@ -1,7 +1,7 @@
+ #include <igraph.h>
+ 
+ #include "bench.h"
+-#include "../../vendor/plfit/sampling.h"
++#include <plfit/plfit_sampling.h>
+ 
+ igraph_vector_t data;
+ 
 --- a/src/misc/other.c
 +++ b/src/misc/other.c
 @@ -26,8 +26,8 @@
@@ -115,19 +126,8 @@ Last-Update: 2021-11-14
  #include "core/interruption.h"
 -#include "plfit/error.h"
 -#include "plfit/plfit.h"
-+#include "plfit_error.h"
-+#include "plfit.h"
++#include <plfit/plfit_error.h>
++#include <plfit/plfit.h>
  
  #include <math.h>
  
---- a/tests/benchmarks/igraph_power_law_fit.c
-+++ b/tests/benchmarks/igraph_power_law_fit.c
-@@ -1,7 +1,7 @@
- #include <igraph.h>
- 
- #include "bench.h"
--#include "../../vendor/plfit/sampling.h"
-+#include "plfit_sampling.h"
- 
- igraph_vector_t data;
- 



View it on GitLab: https://salsa.debian.org/med-team/igraph/-/commit/a7bb490d761b288236f73c239ae5e563719af2d7

-- 
View it on GitLab: https://salsa.debian.org/med-team/igraph/-/commit/a7bb490d761b288236f73c239ae5e563719af2d7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220104/063ecd9c/attachment-0001.htm>
