[med-svn] [Git][med-team/pplacer][master] 3 commits: Make rules cross-builder friendly

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pplacer


Commits:
00ed9197 by Andreas Tille at 2020-06-22T08:39:32+02:00
Make rules cross-builder friendly

- - - - -
bf187f56 by Andreas Tille at 2020-06-22T08:55:10+02:00
License for code copy of libcdd

- - - - -
92732f22 by Andreas Tille at 2020-06-22T08:57:26+02:00
Fix copyright

- - - - -


3 changed files:

- debian/changelog
- debian/copyright
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,5 @@
 pplacer (1.1~alpha19-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #<bug>)
-  Depends guppy and rppr - asked for GPL versions at
-    https://github.com/matsen/pplacer/issues/371
 
  -- Andreas Tille <tille at debian.org>  Fri, 22 May 2020 07:19:29 +0200


=====================================
debian/copyright
=====================================
@@ -3,9 +3,36 @@ Upstream-Name: pplacer
 Source: https://github.com/matsen/pplacer/releases
 
 Files: *
-Copyright: 20xx-20yy <upstream>
+Copyright: 2010-2018 Matsen, F.A. and Kodner, R.B. and Armbrust, E.
 License: GPL-3
 
+Files: cdd_src/cdd.h
+       cdd_src/cddcore.c
+       cdd_src/cddio.c
+       cdd_src/cddlib.c
+       cdd_src/cddlp.c
+       cdd_src/cddmp.*
+       cdd_src/cddproj.c
+       cdd_src/cddtypes.h
+       cdd_src/setoper*
+Copyright: 1993-2008 Komei Fukuda <fukuda at ifor.math.ethz.ch>
+           1994 David Bremner
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems you can find the full text of the GNU General Public
+ License at /usr/share/common-licenses/GPL-2.
+Comment: Due to the additional code that adapts cdd to ocaml it
+ seems to hard to use Debian packaged libcdd-dev.  Thus the code copy.
+
 Files: debian/*
 Copyright: 2020 Andreas Tille <tille at debian.org>
 License: GPL-3


=====================================
debian/rules
=====================================
@@ -1,18 +1,6 @@
 #!/usr/bin/make -f
 
 # DH_VERBOSE := 1
-export LC_ALL=C.UTF-8
-
-include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
 
 # for hardening you might like to uncomment this:
 # export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -22,7 +10,7 @@ include /usr/share/dpkg/default.mk
 
 override_dh_auto_build:
 	# Fix race condition (fails due to multiple mkdirs)
-	make -j 1
+	dh_auto_build --no-parallel
 
 ### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
 #override_dh_auto_test:



View it on GitLab: https://salsa.debian.org/med-team/pplacer/-/compare/5f60099dfd060e64d3566b75837c09dae00085d6...92732f227ecef23f235fce54cd28d410a9c2a634

-- 
View it on GitLab: https://salsa.debian.org/med-team/pplacer/-/compare/5f60099dfd060e64d3566b75837c09dae00085d6...92732f227ecef23f235fce54cd28d410a9c2a634
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/20200622/a4085e4a/attachment-0001.html>