[gmp-ecm] 04/04: Imported Debian patch 7.0.1+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Wed Jun 1 23:41:52 UTC 2016
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 452d6726ce4e083f988666483ffaefbe21d2a9a5
Author: Jerome Benoit <calculus at rezozer.net>
Date: Wed Jun 1 19:06:21 2016 +0100
Imported Debian patch 7.0.1+ds-1
---
debian/adhoc/missing/README.source | 6 ++++++
debian/adhoc/missing/c155 | 1 +
debian/adhoc/missing/c270 | 1 +
debian/changelog | 18 ++++++++++++++---
debian/control | 22 +++++++++++++++++----
debian/copyright | 3 +--
debian/gmp-ecm.examples | 2 ++
...ecm-dev-common.docs => libecm1-dev-common.docs} | 0
...common.examples => libecm1-dev-common.examples} | 0
...v-common.install => libecm1-dev-common.install} | 0
debian/{libecm-dev.install => libecm1-dev.install} | 0
debian/libecm1.docs | 1 -
debian/patches/series | 4 +---
.../upstream-autotoolization-noexecstack.patch | 18 -----------------
.../patches/upstream-autotoolization-shlibs.patch | 17 ++++++++++++++++
.../upstream-lintian-spelling-error-silence.patch | 20 -------------------
...tream-longcheck-neutralize-forgotten-code.patch | 23 ----------------------
debian/rules | 2 +-
debian/tests/build-examples | 2 +-
debian/tests/control | 2 +-
debian/tests/make-longcheck | 2 +-
21 files changed, 66 insertions(+), 78 deletions(-)
diff --git a/debian/adhoc/missing/README.source b/debian/adhoc/missing/README.source
new file mode 100644
index 0000000..fd28fe9
--- /dev/null
+++ b/debian/adhoc/missing/README.source
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000..c90ab0b
--- /dev/null
+++ b/debian/adhoc/missing/c155
@@ -0,0 +1 @@
+95209938255048826235189575712705128366296557149606415206280987204268594538412191641776798249266895999715600261737863698825644292938050707507901970225804581
diff --git a/debian/adhoc/missing/c270 b/debian/adhoc/missing/c270
new file mode 100644
index 0000000..ab4ffe9
--- /dev/null
+++ b/debian/adhoc/missing/c270
@@ -0,0 +1 @@
+119289271643410661659011895607772139647921376305643327040133340560424162255590014476006522815032183459410826649812381782024580435488953253421188979709766709602606088795137550915161002646980490840248715831209139007534778111499928885914673593417099541437886281968493172159
diff --git a/debian/changelog b/debian/changelog
index 974bea1..e159854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,23 @@
-gmp-ecm (7.0+ds-2) unstable; urgency=medium
+gmp-ecm (7.0.1+ds-1) unstable; urgency=medium
+ * New upstream release (Closes: #819702).
* Debianization:
- debian/control:
- Standards-Version, dump to 3.9.8;
- - Provides/Breaks/Conflicts policy, rationalize (Closes: #819696, #819802).
+ - rationalize (Closes: #819696, #819802);
+ - debian/patches/:
+ - d/p/upstream-lintian-spelling-error-silence.patch, discard as it has
+ been integrated, thanks to the upstream maintainer;
+ - d/p/upstream-autotoolization-noexecstack.patch, idem;
+ - d/p/upstream-longcheck-neutralize-forgotten-code.patch, discard as it
+ has been partially integrated while the non-integrated part was clumsy,
+ thanks to the upstream maintainer;
+ -d/p/upstream-autotoolization-shlibs.patch, introduce;
+ - debian/tests/:
+ - d/t/make-longcheck, improve;
+ - debian/adhoc/missing/, introduce.
- -- Jerome Benoit <calculus at rezozer.net> Sat, 28 May 2016 11:18:49 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Wed, 01 Jun 2016 22:28:52 +0000
gmp-ecm (7.0+ds-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 75098f6..3634723 100644
--- a/debian/control
+++ b/debian/control
@@ -64,11 +64,13 @@ Description: factor integers using the Elliptic Curve Method -- lib
.
This package provides the shared library.
-Package: libecm-dev
+Package: libecm1-dev
Section: libdevel
Architecture: any
+Replaces: libecm0-dev
+Breaks: libecm0-dev
Depends:
- libecm1 (= ${binary:Version}), libecm-dev-common (= ${source:Version}),
+ libecm1 (= ${binary:Version}), libecm1-dev-common (= ${source:Version}),
libgmp-dev, ${misc:Depends}
Multi-Arch: same
Description: factor integers using the Elliptic Curve Method -- libdev
@@ -91,11 +93,13 @@ Description: factor integers using the Elliptic Curve Method -- libdev
This package provides the static library and symbolic links needed
for development.
-Package: libecm-dev-common
+Package: libecm1-dev-common
Section: libdevel
Architecture: all
+Replaces: libecm-dev (<= 6.4.4-2), libecm0-dev-common
+Breaks: libecm-dev (<= 6.4.4-2), libecm0-dev-common
Depends: ${misc:Depends}
-Recommends: libecm-dev (=${binary:Version})
+Recommends: libecm1-dev (=${binary:Version})
Multi-Arch: foreign
Description: factor integers using the Elliptic Curve Method -- header
gmp-ecm is a free implementation of the Elliptic Curve Method (ECM)
@@ -115,3 +119,13 @@ Description: factor integers using the Elliptic Curve Method -- header
information about ecmnet.
.
This package provides the header needed by developers.
+
+Package: libecm-dev
+Section: oldlibs
+Priority: extra
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libecm1-dev (>= ${source:Version}), libecm1-dev (<< ${source:Version}.1~), ${misc:Depends}
+Multi-Arch: foreign
+Description: dummy package
+ This is a dummy package.
diff --git a/debian/copyright b/debian/copyright
index 1f4ebdd..c46703c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: gmp-ecm
-Upstream-Contact:
- Paul Zimmermann <zimmerma+gforge at loria.fr>
+Upstream-Contact: Paul Zimmermann <zimmerma+gforge at loria.fr>
Source: http://gforge.inria.fr/projects/ecm/
Comment:
The upstream source tarball is repacked to drop off some substantial
diff --git a/debian/gmp-ecm.examples b/debian/gmp-ecm.examples
new file mode 100644
index 0000000..a7f72d1
--- /dev/null
+++ b/debian/gmp-ecm.examples
@@ -0,0 +1,2 @@
+debian/adhoc/missing/c155
+debian/adhoc/missing/c270
diff --git a/debian/libecm-dev-common.docs b/debian/libecm1-dev-common.docs
similarity index 100%
rename from debian/libecm-dev-common.docs
rename to debian/libecm1-dev-common.docs
diff --git a/debian/libecm-dev-common.examples b/debian/libecm1-dev-common.examples
similarity index 100%
rename from debian/libecm-dev-common.examples
rename to debian/libecm1-dev-common.examples
diff --git a/debian/libecm-dev-common.install b/debian/libecm1-dev-common.install
similarity index 100%
rename from debian/libecm-dev-common.install
rename to debian/libecm1-dev-common.install
diff --git a/debian/libecm-dev.install b/debian/libecm1-dev.install
similarity index 100%
rename from debian/libecm-dev.install
rename to debian/libecm1-dev.install
diff --git a/debian/libecm1.docs b/debian/libecm1.docs
index eb9b151..ff9f8cf 100644
--- a/debian/libecm1.docs
+++ b/debian/libecm1.docs
@@ -1,3 +1,2 @@
NEWS
-README
AUTHORS
diff --git a/debian/patches/series b/debian/patches/series
index 949a6ba..13823fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
#upstream-libtoolization-version_script.patch
-upstream-lintian-spelling-error-silence.patch
-upstream-autotoolization-noexecstack.patch
-upstream-longcheck-neutralize-forgotten-code.patch
+upstream-autotoolization-shlibs.patch
debianization-examples.patch
diff --git a/debian/patches/upstream-autotoolization-noexecstack.patch b/debian/patches/upstream-autotoolization-noexecstack.patch
deleted file mode 100644
index c6da915..0000000
--- a/debian/patches/upstream-autotoolization-noexecstack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: upstream -- autotoolization -- noexecstack
- Mark the ECM shared library as not requiring executable stack;
- meant to be submitted to the upstream maintainer team.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-03-19
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,7 +46,7 @@
- # www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
- # If any interfaces have been added, removed, or changed since the last
- # update, increment current, and set revision to 0.
--libecm_la_LDFLAGS = $(LIBECM_LDFLAGS) -version-info 1:0:0 -g
-+libecm_la_LDFLAGS = $(LIBECM_LDFLAGS) -version-info 1:0:0 -g -Wl,-znoexecstack
- libecm_la_LIBADD = $(MULREDCLIBRARY)
- if WANT_GPU
- libecm_la_SOURCES += cudakernel.cu
diff --git a/debian/patches/upstream-autotoolization-shlibs.patch b/debian/patches/upstream-autotoolization-shlibs.patch
new file mode 100644
index 0000000..533d58f
--- /dev/null
+++ b/debian/patches/upstream-autotoolization-shlibs.patch
@@ -0,0 +1,17 @@
+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/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
deleted file mode 100644
index c28d948..0000000
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: source typo
- Correct spelling error as reported by lintian in some material;
- meant to silence lintian and eventually to be submitted to the
- upstream maintainer.
-Origin: debian
-Comment: spelling-error-in-binary
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-03-19
-
---- a/ecm.1
-+++ b/ecm.1
-@@ -429,7 +429,7 @@
- .PP
- Bit 0
- .RS 4
--0 if normal program termination, 1 if error occured
-+0 if normal program termination, 1 if error occurred
- .RE
- .PP
- Bit 1
diff --git a/debian/patches/upstream-longcheck-neutralize-forgotten-code.patch b/debian/patches/upstream-longcheck-neutralize-forgotten-code.patch
deleted file mode 100644
index 4dc393d..0000000
--- a/debian/patches/upstream-longcheck-neutralize-forgotten-code.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: longcheck: neutralize forgotten code
- Mainly neutralize forgotten code in longcheck scripts
- to render them runnable; meant to be submitted to the
- upstream maintainer.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-03-20
-
---- a/testlong.ecm
-+++ b/testlong.ecm
-@@ -86,9 +86,9 @@
- $ECM -resume test_M877.save 0 819632383
- checkcode $? 6
-
--# exercise estimated memory usage in Gb
--$ECM -v -k 1 1 8e11 < c155
-+## # exercise estimated memory usage in Gb
-+## $ECM -v -k 1 1 8e11 < c155
-
--rm test_M877.save
-+rm test_M877.save M997.save
-
- echo "All ECM tests are ok."
diff --git a/debian/rules b/debian/rules
index 1db5962..60ace5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_install-indep:
$(MAKE) -C _build install-data-am DESTDIR=$(CURDIR)/debian/tmp
override_dh_installdocs:
- dh_installdocs -plibecm-dev --link-doc=libecm-dev-common
+ dh_installdocs -plibecm1-dev --link-doc=libecm1-dev-common
dh_installdocs --remaining-packages
override_dh_compress-indep:
diff --git a/debian/tests/build-examples b/debian/tests/build-examples
index be5d851..ee14080 100755
--- a/debian/tests/build-examples
+++ b/debian/tests/build-examples
@@ -3,7 +3,7 @@
set -ue
cd $ADTTMP
-cp -prd /usr/share/doc/libecm-dev/examples .
+cp -prd /usr/share/doc/libecm1-dev/examples .
cd examples
make
diff --git a/debian/tests/control b/debian/tests/control
index c658037..70947aa 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
Tests: build-examples
-Depends: libecm-dev, build-essential
+Depends: libecm1-dev, build-essential
Tests: make-longcheck
Depends: gmp-ecm, make
diff --git a/debian/tests/make-longcheck b/debian/tests/make-longcheck
index 9e4e151..d395886 100755
--- a/debian/tests/make-longcheck
+++ b/debian/tests/make-longcheck
@@ -34,7 +34,7 @@ longcheck+test+%:
longcheck+testlong+%:
@mkdir \$@
- ( cd \$@ ; \$(abs_top_pkgdir)/testlong.\$(word 3,\$(subst +, ,\$@)) "\$(GMPECM)" ;)
+ ( cd \$@ ; cp -vp \$(abs_top_pkgdir)/debian/adhoc/missing/c155 . ; \$(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
More information about the debian-science-commits
mailing list