[normaliz] 01/04: Imported Debian pre-patch 2.99.4+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Wed Sep 2 02:44:30 UTC 2015


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

calculus-guest pushed a commit to branch experimental
in repository normaliz.

commit 2e8b630751fba8c50c15bdb76dee2a057603af23
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Sep 1 18:06:43 2015 +0200

    Imported Debian pre-patch 2.99.4+ds-1
---
 debian/changelog |  16 +++++++
 debian/copyright |   4 ++
 debian/repack    | 131 -------------------------------------------------------
 debian/rules     |   2 +-
 debian/watch     |   5 +--
 5 files changed, 23 insertions(+), 135 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fcb46b..925c7f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+normaliz (2.99.4+ds-1) experimental; urgency=medium
+
+  * New upstream version:
+    - thanks for the upstream maintainer team for rendering the upstream
+      source more suitable for distribution packaging.
+  * 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>  Tue, 01 Sep 2015 15:56:38 +0000
+
 normaliz (2.12.2+ds-1) unstable; urgency=medium
 
   * Initial release. (Closes: #776019)
diff --git a/debian/copyright b/debian/copyright
index 9384e3e..64ed420 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: normaliz
 Upstream-Contact: normaliz team <normaliz at uos.de>
 Source: http://www.math.uos.de/normaliz/
+X-Upstream-Vcs: git clone https://github.com/Normaliz/Normaliz.git
+Files-Excluded:
+ homepage
+ source/libnormaliz/version.h
 
 Files: *
 Copyright:
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index 519ddcc..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-PACKAGE_NAME=normaliz
-
-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"
-## wipe out built material
-rm --verbose --recursive --force -- source/jNormaliz/build
-rm --verbose --force -- source/jNormaliz/build.xml
-## wipe out Java source balls
-rm --verbose --recursive --force -- source/jNormaliz/lib/commons-exec-1.0.1
-rm --verbose --force -- source/jNormaliz/lib/swing-app-framework/appframework-1.0.3-doc.zip
-rm --verbose --force -- source/jNormaliz/lib/junit/junit-3.8.2-api.zip
-rm --verbose --force -- source/jNormaliz/lib/junit_4/junit-4.5-api.zip
-## wipe out Java ARchive files
-find . -name '*.jar' | xargs --no-run-if-empty rm --verbose --force
-## clean up Java external library material
-rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/CopyLibs
-rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/junit
-rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/junit_4
-rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/swing-app-framework
-rm --verbose --force -- source/jNormaliz/lib/nblibraries.properties
-rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib
-rmdir --verbose --ignore-fail-on-non-empty -- lib
-## wipe out published papers
-rm --verbose --force -- "doc/Algorithms for affine monoids and rational cones.pdf"
-rm --verbose --force -- "doc/Challenging computations of Hilbert bases of cones associated with algebraic statistics.pdf"
-rm --verbose --force -- "doc/Computing the integral closure of an affine semigroup.pdf"
-rm --verbose --force -- "doc/The power of pyramid decomposition in Normaliz.pdf"
-## wipe out regenerated documentation
-rm --verbose --force -- source/jNormaliz/doc/jNormaliz_1.6.pdf
-rm --verbose --force -- doc/Normaliz.pdf
-rm --verbose --force -- doc/NmzIntegrate.pdf
-rm --verbose --force -- doc/jNormaliz_1.6.pdf
-## wipe out duplicate material
-rm --verbose --force -- doc/jNormaliz.jpg
-## wipe out
-#rm --verbose --force -- build-aux/test-driver
-#rmdir --verbose --ignore-fail-on-non-empty -- build-aux
-##
-## remove executable bit for source files
-#chmod --changes a-x m4/flint-check.m4
-## discard autoconf-archive material
-#rm --verbose --force -- m4/ax_append_compile_flags.m4
-#:
-
-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-  --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 fbd8ca2..76e296c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,4 +38,4 @@ override_dh_auto_clean-indep:
 	[ ! -f doc/Makefile ] || $(MAKE) -C doc maintainer-clean
 
 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 af1f709..004075c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds// \
-http://www.home.uni-osnabrueck.de/wbruns/normaliz/Normaliz([\d\.]+)/Normaliz([\d\.]+)\.zip \
-debian sh debian/repack
+opts=dversionmangle=s/\+ds//,repacksuffix=+ds,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/normaliz-$1\.tar\.gz/ \
+https://github.com/Normaliz/Normaliz/releases .*/v?(\d\S*)\.tar\.gz

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



More information about the debian-science-commits mailing list