[mpfrc++] 01/03: Imported Debian prepatch 3.6.2+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Mon Apr 13 10:14:20 UTC 2015


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

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

commit 73ccaea8981691b2ea2850379fc64d7d06251836
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Apr 13 12:05:38 2015 +0200

    Imported Debian prepatch 3.6.2+ds-1
---
 debian/changelog | 16 ++++++++++
 debian/control   |  2 +-
 debian/copyright | 35 +++++-----------------
 debian/repack    | 91 --------------------------------------------------------
 debian/watch     |  5 ++--
 5 files changed, 26 insertions(+), 123 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 560f20e..1fbcb2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+mpfrc++ (3.6.2+ds-1) unstable; urgency=medium
+
+  * New upstream version:
+    - plain GPL-3+, namely no more FOSS License Exception.
+  * 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);
+    - debian/control, replace the short description by the one given in the
+      Mercurial README.md file.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 13 Apr 2015 09:50:37 +0000
+
 mpfrc++ (3.6.1+ds-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 43659db..d4ed881 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: libmpfrc++-dev
 Section: libdevel
 Architecture: all
 Depends: libmpfr-dev, ${misc:Depends}
-Description: C++ wrapper for the GNU MPFR C library
+Description: multi-precision floating point number class for C++
  MPFR C++ introduces C++ arbitrary precision numeric types; based on
  GNU MPFR --- Multiple Precision Floating-Point Reliable Library.
  .
diff --git a/debian/copyright b/debian/copyright
index 6232a54..c114556 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,42 +3,21 @@ Upstream-Name: mpfrc++
 Upstream-Contact: Pavel Holoborodko <pavel at holoborodko.com>
 Source: http://www.holoborodko.com/pavel/mpfr
 X-Upstream-Vcs: https://bitbucket.org/advanpix/mpreal
-Comment:
- The upstream source tarball is repacked to wipe out Mercurial metadata
- material not meant to be distributed.
+Files-Excluded:
+ .hgtags
+ .hg_archival.txt
+ README.md
 
 Files: *
 Copyright:
- 2008-2014 Pavel Holoborodko <pavel at holoborodko.com>
-License: GPL-3+ with FOSS License Exception
+ 2008-2015 Pavel Holoborodko <pavel at holoborodko.com>
+License: GPL-3+
 
 Files: debian/*
 Copyright:
- 2014 Jerome Benoit <calculus at rezozer.net>
+ 2014-2015 Jerome Benoit <calculus at rezozer.net>
 License: GPL-3+
 
-License: GPL-3+ with FOSS License Exception
- This package 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 3 of the License, or
- (at your option) any later version.
- .
- There are special exceptions to the terms and conditions of the GNU
- General Public License as it is applied to this software. View the
- full text of the exception in file "FOSSLicenseException.txt" in
- the directory of this software distribution.
- .
- This package 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
 License: GPL-3+
  This package is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index 0292bc3..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-PACKAGE_NAME=mpfrc++
-
-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_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
-rm --verbose --force -- .hgtags
-rm --verbose --force -- .hg_archival.txt
-## clean up
-#:
-
-cd ${REPACK_WORKING_FOLDER}
-set +f
-## end
-mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}"
-
-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/watch b/debian/watch
index 031b030..5b962ef 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds// \
-https://bitbucket.org/advanpix/mpreal/downloads .*/mpfrc\+\+-(.+)\.tar\.(?:gz|bz2|xz) \
-debian sh debian/repack
+opts=dversionmangle=s/\+ds//,repacksuffix=+ds \
+https://bitbucket.org/advanpix/mpreal/downloads .*/mpfrc\+\+-(.+)\.tar\.(?:gz|bz2|xz)

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



More information about the debian-science-commits mailing list