[singular] 01/04: Imported Debian pre-patch 4.0.3-p1+ds-0

Jerome Benoit calculus-guest at moszumanska.debian.org
Thu Apr 28 19:13:51 UTC 2016


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

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

commit 21bc189dd768508f24543901a1c1517dd39ab773
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Apr 25 22:58:42 2016 +0000

    Imported Debian pre-patch 4.0.3-p1+ds-0
---
 debian/changelog |  13 +++++
 debian/copyright |  57 ++++++++++++++++++
 debian/repack    | 172 -------------------------------------------------------
 debian/rules     |   2 +-
 debian/watch     |   7 +--
 5 files changed, 74 insertions(+), 177 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4711bb7..f18f4be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+singular (4.0.3-p1+ds-0) UNRELEASED; urgency=medium
+
+  * Debianization:
+    - debian/copyright:
+      - repack by using the Files-Excluded machinery instead of the ad-hoc
+        script debian/repack;
+      - refresh;
+    - debian/repack, discard (see above);
+    - debian/watch:
+      - revisit (see above).
+
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 27 Apr 2016 02:21:00 +0000
+
 singular (4.0.3+ds-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 9ba2fb1..63ba538 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,63 @@ Comment:
  The upstream source tarball is repacked to drop off the regenerated material
  (mainly autotools related) and material provided by other packages (mainly
  autoconf-archive m4 files) to gain weight.
+ (At the time of writting, the latest ax_prefix_config_h.m4 as distributed
+ within the autoconf-archive is not compatible with the version distributed
+ within Singular (serial 11); more precisely, not providing a prefix is an
+ error in the lastest version (serial 15). Second, ax_python_with_version.m4
+ does not belong to autoconf-archive.)
+Files-Excluded:
+ redhat
+ README.md
+ m4/lt~obsolete.m4
+ m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/libtool.m4
+ build-aux/ylwrap
+ build-aux/depcomp
+ build-aux/compile
+ build-aux/ar-lib
+ build-aux/install-sh
+ build-aux/ltmain.sh
+ build-aux/missing
+ build-aux/config.sub
+ build-aux/config.guess
+ build-aux/test-driver
+ make_tar.sh
+ */aclocal.m4
+ */Makefile.in
+ gfanlib/_config.h.in
+ gfanlib/configure
+ libpolys/_config.h.in
+ libpolys/configure
+ factory/acinclude.m4
+ factory/_config.h.in
+ factory/configure
+ omalloc/_config.h.in
+ omalloc/configure
+ resources/_config.h.in
+ resources/configure
+ _config.h.in
+ configure
+ doc/Singular.man
+ doc/TSingular.man
+ doc/ESingular.man
+ m4/ax_append_compile_flags.m4
+ m4/ax_append_flag.m4
+ m4/ax_append_link_flags.m4
+ m4/ax_check_compile_flag.m4
+ m4/ax_check_link_flag.m4
+ m4/ax_compute_relative_paths.m4
+ m4/ax_cxx_gcc_abi_demangle.m4
+ m4/ax_normalize_path.m4
+ m4/ax_prog_python_version.m4
+ m4/ax_pthread.m4
+ m4/ax_python_config_var.m4
+ m4/ax_python_devel.m4
+ m4/ax_python_embed.m4
+ m4/ax_python.m4
+ m4/ax_python_module.m4
 
 Files: *
 Copyright:
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index 74e3d61..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-
-PACKAGE_NAME=singular
-
-set -e
-set -u
-
-usage() {
-	echo "Usage: repack --upstream-version <ver> <downloaded file>"
-	exit 1
-	}
-
-if [ "$#" != "3" ]; then
-	usage
-fi
-if [ "$1" != "--upstream-version" ]; then
-	usage
-fi
-if [ ! -f "$3" ]; then
-	if [ -n "$3" ]; then
-		echo "$3 doesn't exist"
-	fi
-	usage
-fi
-UPSTREAM_VERSION="$2"
-UPSTREAM_TARBALLZZ="$3"
-
-DEBIAN_SUFFIX="+ds"
-####DEBIAN_ENCAPSULATEDFOLDERNAME="${PACKAGE_NAME}-usrc"
-
-DEBIAN_UVERSION=${UPSTREAM_VERSION}${DEBIAN_SUFFIX}
-DEBIAN_ROOTFOLDERNAME="${PACKAGE_NAME}-${DEBIAN_UVERSION}.orig"
-DEBIAN_TARBALLXZ="$(dirname $UPSTREAM_TARBALLZZ)/${PACKAGE_NAME}_${DEBIAN_UVERSION}.orig.tar.xz"
-
-REPACK_TMPDIR=`mktemp -d ./repackXXXXXX`
-REPACK_TMPDIR=$(readlink -f "$REPACK_TMPDIR")
-trap "/bin/rm -rf \"$REPACK_TMPDIR\"" QUIT INT EXIT
-
-message() {
-	echo
-	echo "-- -- $1"
-	echo
-	}
-
-message "Repackaging $UPSTREAM_TARBALLZZ"
-
-UPSTREAM_ROOTFOLDER="${REPACK_TMPDIR}/unpacked"
-mkdir "${UPSTREAM_ROOTFOLDER}"
-tar -C "${UPSTREAM_ROOTFOLDER}" -xf "${UPSTREAM_TARBALLZZ}" || unzip -d "${UPSTREAM_ROOTFOLDER}" "${UPSTREAM_TARBALLZZ}"
-if [ `ls -1 "${UPSTREAM_ROOTFOLDER}" | wc -l` -eq 1 ]; then
-	UPSTREAM_ROOTFOLDER="${UPSTREAM_ROOTFOLDER}/`ls -1 "${UPSTREAM_ROOTFOLDER}"`"
-fi
-
-DEBIAN_ROOTFOLDER="${REPACK_TMPDIR}/${DEBIAN_ROOTFOLDERNAME}"
-## repack
-####set -f
-REPACK_WORKING_FOLDER=$(pwd)
-cd "${UPSTREAM_ROOTFOLDER}"
-
-####. "${REPACK_WORKING_FOLDER}/debian/repack.local"
-## discard dot-git files
-rm --verbose --force -- .tarball-git-version
-## discard other distribution material to avoid confusion
-rm --verbose --force --recursive -- redhat
-## discard third party packages
-rm --verbose --force --recursive -- Singular/LIB/surfex
-## wipe out
-rm --verbose --force -- README.md
-rm --verbose --force -- m4/lt~obsolete.m4
-rm --verbose --force -- m4/ltoptions.m4
-rm --verbose --force -- m4/ltsugar.m4
-rm --verbose --force -- m4/ltversion.m4
-rm --verbose --force -- m4/libtool.m4
-rm --verbose --force -- build-aux/ylwrap
-rm --verbose --force -- build-aux/depcomp
-rm --verbose --force -- build-aux/compile
-rm --verbose --force -- build-aux/ar-lib
-rm --verbose --force -- build-aux/install-sh
-rm --verbose --force -- build-aux/ltmain.sh
-rm --verbose --force -- build-aux/missing
-rm --verbose --force -- build-aux/config.sub
-rm --verbose --force -- build-aux/config.guess
-rm --verbose --force -- build-aux/test-driver
-rmdir --verbose --ignore-fail-on-non-empty -- build-aux
-rm --verbose --force -- make_tar.sh
-rm --verbose --force -- warn_not_found.sh
-##
-find . -name 'autom4te.cache' | xargs --no-run-if-empty rm --verbose --recursive --force
-find . -name 'aclocal.m4' | xargs --no-run-if-empty rm --verbose --force
-find . -name 'Makefile.in' | xargs --no-run-if-empty rm --verbose --force
-rm --verbose --force -- gfanlib/_config.h.in
-rm --verbose --force -- gfanlib/configure
-rm --verbose --force -- libpolys/_config.h.in
-rm --verbose --force -- libpolys/configure
-rm --verbose --force -- factory/acinclude.m4
-####rm --verbose --force -- factory/aminclude.am
-rm --verbose --force -- factory/_config.h.in
-rm --verbose --force -- factory/configure
-rm --verbose --force -- omalloc/_config.h.in
-rm --verbose --force -- omalloc/configure
-rm --verbose --force -- resources/_config.h.in
-rm --verbose --force -- resources/configure
-rm --verbose --force -- _config.h.in
-rm --verbose --force -- configure
-##
-rm --verbose --force -- factory/readcf.cc
-rm --verbose --force -- Singular/feOptES.inc
-rm --verbose --force -- Singular/feOptTS.inc
-rm --verbose --force -- Singular/all.lib
-##
-rm --verbose --force -- doc/Singular.man
-rm --verbose --force -- doc/TSingular.man
-rm --verbose --force -- doc/ESingular.man
-rmdir --verbose --ignore-fail-on-non-empty -- doc
-## remove executable bit for source files
-chmod --changes a-x m4/flint-check.m4
-chmod --changes a-x gfanlib/configure.ac
-## discard autoconf-archive material
-rm --verbose --force -- m4/ax_append_compile_flags.m4
-rm --verbose --force -- m4/ax_append_flag.m4
-rm --verbose --force -- m4/ax_append_link_flags.m4
-rm --verbose --force -- m4/ax_check_compile_flag.m4
-rm --verbose --force -- m4/ax_check_link_flag.m4
-rm --verbose --force -- m4/ax_compute_relative_paths.m4
-rm --verbose --force -- m4/ax_cxx_gcc_abi_demangle.m4
-rm --verbose --force -- m4/ax_normalize_path.m4
-####rm --verbose --force -- m4/ax_prefix_config_h.m4
-###### comment:
-######  at the time of writting, the latest ax_prefix_config_h.m4
-######  as distributed within the autoconf-archive is not compatible
-######  with this version (serial 11); more precisely, not providing
-######  a prefix is an error in the lastest version (serial 15).
-rm --verbose --force -- m4/ax_pthread.m4
-rm --verbose --force -- m4/ax_python_embed.m4
-####rm --verbose --force -- m4/ax_python_with_version.m4
-###### comment:
-######  ax_python_with_version.m4 does not belong to autoconf-archive.
-## remove executable bit for source files
-chmod --changes a-x Singular/extra.cc
-#:
-
-cd ${REPACK_WORKING_FOLDER}
-set +f
-## end
-####if [ -n "${DEBIAN_ENCAPSULATEDFOLDERNAME}" ]; then
-####	mkdir "${DEBIAN_ROOTFOLDER}"
-####	mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}/${DEBIAN_ENCAPSULATEDFOLDERNAME}"
-####else
-	mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}"
-####fi
-
-REPACK_TARBALL="${REPACK_TMPDIR}/repacked.tar"
-REPACK_TARBALLXZ="${REPACK_TARBALL}.xz"
-( cd "${REPACK_TMPDIR}" && \
-	find -L "${DEBIAN_ROOTFOLDERNAME}" -xdev -type f -print | sort | \
-	tar -T- --numeric-owner --owner=root --group=root --mode=a+rX --create --file "${REPACK_TARBALL}" \
-	)
-xz -9e < "${REPACK_TARBALL}" > "${REPACK_TARBALLXZ}"
-mv "${REPACK_TARBALLXZ}" "${DEBIAN_TARBALLXZ}"
-
-message "Testing ${DEBIAN_TARBALLXZ}"
-
-xz --verbose --test "${DEBIAN_TARBALLXZ}"
-
-message "Printing information about ${DEBIAN_TARBALLXZ}"
-
-xz --verbose --list "${DEBIAN_TARBALLXZ}"
-
-message "Quitting"
-
-##
-## eos
diff --git a/debian/rules b/debian/rules
index 3137269..8c32456 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,4 +29,4 @@ override_dh_link-arch:
 		/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/Singular.pc /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/singular.pc
 
 get-orig-source:
-	uscan --no-conf --download-current-version --verbose
+	uscan --no-conf --download-current-version --compression xz --verbose
diff --git a/debian/watch b/debian/watch
index 9fa5a44..b8b9677 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-version=3
-opts=dversionmangle=s/\+ds//,uversionmangle=s/p/-p/ \
-http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/([\d-]+)/ singular-([\d\.]+|[\d\.]+p\d+)\.tar\.gz \
-debian sh debian/repack
+version=4
+opts=repack,dversionmangle=s/\+ds//,uversionmangle=s/p/-p/,repacksuffix=+ds \
+http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/([\d-]+)/ singular-([\d\.]+|[\d\.]+p\d+)\.tar\.gz

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



More information about the debian-science-commits mailing list