[gmp-ecm] 04/04: Imported Debian patch 7.0.2+ds-1

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository gmp-ecm.

commit 1671a7ce04eb43e5d3469c47901381c1e24afc1e
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Jun 28 16:43:05 2016 +0100

    Imported Debian patch 7.0.2+ds-1
---
 debian/adhoc/missing/README.source                   |  6 ------
 debian/adhoc/missing/c155                            |  1 -
 debian/adhoc/missing/c270                            |  1 -
 debian/changelog                                     | 13 ++++++++++---
 debian/gmp-ecm.examples                              |  3 +--
 debian/patches/series                                |  1 -
 debian/patches/upstream-autotoolization-shlibs.patch | 17 -----------------
 debian/tests/make-longcheck                          |  3 ++-
 8 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/debian/adhoc/missing/README.source b/debian/adhoc/missing/README.source
deleted file mode 100644
index fd28fe9..0000000
--- a/debian/adhoc/missing/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This ad-hoc folder contains upstream source material that is not distributed
-within the upstream source tarball but nevertheless either (implicitly) cited
-in the upstream README file or used by some test scripts; they were extracted
-by hand, while an email request was sent to the upstream contact.
-
- -- Jerome Benoit <calculus at rezozer.net>  Sat, 28 May 2016 15:06:20 +0000
diff --git a/debian/adhoc/missing/c155 b/debian/adhoc/missing/c155
deleted file mode 100644
index c90ab0b..0000000
--- a/debian/adhoc/missing/c155
+++ /dev/null
@@ -1 +0,0 @@
-95209938255048826235189575712705128366296557149606415206280987204268594538412191641776798249266895999715600261737863698825644292938050707507901970225804581
diff --git a/debian/adhoc/missing/c270 b/debian/adhoc/missing/c270
deleted file mode 100644
index ab4ffe9..0000000
--- a/debian/adhoc/missing/c270
+++ /dev/null
@@ -1 +0,0 @@
-119289271643410661659011895607772139647921376305643327040133340560424162255590014476006522815032183459410826649812381782024580435488953253421188979709766709602606088795137550915161002646980490840248715831209139007534778111499928885914673593417099541437886281968493172159
diff --git a/debian/changelog b/debian/changelog
index 4365458..d462adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-gmp-ecm (7.0.2+ds-1) UNRELEASED; urgency=medium
+gmp-ecm (7.0.2+ds-1) unstable; urgency=medium
 
   * Advanced Tests Failures [i386,armhf] fix release (Closes: #828717).
   * Debianization:
     - debian/copyright:
-      - Files-Excluded field, refresh.
+      - Files-Excluded field, refresh;
+    - debian/patches/:
+      - d/p/upstream-autotoolization-shlibs.patch, discard as it has been
+        integrated, thanks to the upstream maintainer;
+    - debian/adhoc/missing/, discard as the material is now provided within
+      the upstream source ball, thanks to the upstream maintainer;
+    - debian/tests/:
+      - d/t/make-longcheck, refresh.
 
- -- Jerome Benoit <calculus at rezozer.net>  Tue, 28 Jun 2016 10:47:28 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Tue, 28 Jun 2016 15:41:25 +0000
 
 gmp-ecm (7.0.1+ds-2) unstable; urgency=medium
 
diff --git a/debian/gmp-ecm.examples b/debian/gmp-ecm.examples
index a7f72d1..5d010f5 100644
--- a/debian/gmp-ecm.examples
+++ b/debian/gmp-ecm.examples
@@ -1,2 +1 @@
-debian/adhoc/missing/c155
-debian/adhoc/missing/c270
+c155
diff --git a/debian/patches/series b/debian/patches/series
index 13823fe..5d604b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 #upstream-libtoolization-version_script.patch
-upstream-autotoolization-shlibs.patch
 debianization-examples.patch
diff --git a/debian/patches/upstream-autotoolization-shlibs.patch b/debian/patches/upstream-autotoolization-shlibs.patch
deleted file mode 100644
index 533d58f..0000000
--- a/debian/patches/upstream-autotoolization-shlibs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: autotoolization: share libraries: harden
- Add $(GMPLIB) to the ECM library dependency list;
- meant to be submitted to the upstream maintainer.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-06-01
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -54,6 +54,7 @@
-   libecm_la_LDFLAGS += $(CUDALDFLAGS)
-   ecm_LDFLAGS = $(CUDARPATH)
- endif
-+libecm_la_LIBADD += $(GMPLIB)
- 
- bin_PROGRAMS = ecm
- noinst_PROGRAMS = tune ecmfactor bench_mulredc aprcl
diff --git a/debian/tests/make-longcheck b/debian/tests/make-longcheck
index d395886..de4d53a 100755
--- a/debian/tests/make-longcheck
+++ b/debian/tests/make-longcheck
@@ -22,6 +22,7 @@ GMPECM = /usr/bin/ecm
 LISTOFMETHODS = pp1 pm1 ecm
 LISTOFVARIANTS = + -no-ntt -modmuln -redc -mpzmod
 
+export GMPECM_DATADIR=\$(abs_top_pkgdir)
 
 default:
 
@@ -34,7 +35,7 @@ longcheck+test+%:
 
 longcheck+testlong+%:
 	@mkdir \$@
-	( cd \$@ ; cp -vp \$(abs_top_pkgdir)/debian/adhoc/missing/c155 . ; \$(abs_top_pkgdir)/testlong.\$(word 3,\$(subst +, ,\$@)) "\$(GMPECM)" ;)
+	( cd \$@ ; \$(abs_top_pkgdir)/testlong.\$(word 3,\$(subst +, ,\$@)) "\$(GMPECM)" ;)
 
 longcheck+testtree+ecm:
 	@mkdir \$@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmp-ecm.git