[apophenia] 01/04: Imported Debian pre-patch 0.999e+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Fri Jul 10 23:16:01 UTC 2015 

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

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

commit c24faa5172610c140da356d8cc6e7155dc15f923
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Jul 3 02:18:19 2015 +0200

    Imported Debian pre-patch 0.999e+ds-1
---
 debian/changelog |  13 +++++
 debian/copyright |  59 ++++++++++++++-------
 debian/repack    | 156 -------------------------------------------------------
 debian/rules     |   2 +-
 debian/watch     |   5 +-
 5 files changed, 56 insertions(+), 179 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 566d714..7b85657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apophenia (0.999e+ds-1) UNRELEASED; urgency=medium
+
+  * New upstream version (Closes: #777772, #781566).
+  * Debianization:
+    - debian/copyright:
+      - repack by using the Files-Excluded machinery instead of the ad-hoc
+        script debian/repack;
+      - update;
+    - debian/repack, discard (see above);
+    - debian/watch, revisit (see above).
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 02 Jul 2015 23:19:11 +0000
+
 apophenia (0.999c+ds-1) experimental; urgency=medium
 
   * New upstream version (Closes: #764904).
diff --git a/debian/copyright b/debian/copyright
index 7110720..1a325b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,10 +9,36 @@ X-Upstream-Bugs: https://github.com/b-k/apophenia/issues
 Comment:
  The upstream source tarball is repacked to drop off the regenerated
  material, mainly autotools related, to gain substantial weight.
+Files-Excluded:
+ m4/lt~obsolete.m4
+ m4/ltsugar.m4
+ m4/ltoptions.m4
+ m4/ltversion.m4
+ m4/libtool.m4
+ build-aux/compile
+ build-aux/depcomp
+ build-aux/install-sh
+ build-aux/ltmain.sh
+ build-aux/test-driver
+ build-aux/missing
+ build-aux/config.sub
+ build-aux/config.guess
+ transform/Makefile.in
+ model/Makefile.in
+ Makefile.in
+ cmd/Makefile.in
+ tests/Makefile.in
+ docs/Makefile.in
+ eg/Makefile.in
+ acinclude.m4
+ aclocal.m4
+ config.h.in
+ configure
+ apop.h
 
 Files: *
-Copyright: 2005-2014 Ben Klemens <fluffmail at f-m.fm>
-License: GPL-2-with-two-modifications
+Copyright: 2005-2015 Ben Klemens <fluffmail at f-m.fm>
+License: GPL-2
 
 Files: asprintf.c
 Copyright: 1999, 2002 Free Software Foundation, Inc.
@@ -20,26 +46,21 @@ License: GPL-2+
 
 Files: debian/*
 Copyright:
- 2014 Jerome Benoit <calculus at rezozer.net>
+ 2014-2015 Jerome Benoit <calculus at rezozer.net>
 License: GPL-2+
 
-License: GPL-2-with-two-modifications
- This software is licensed under the GNU GPL v2, with two modifications,
- as follows:
+License: GPL-2
+ This is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public
+ License version 2 as published by the Free Software Foundation.
  .
- --An application hosted on a server and remotely operated by users, such
- as a web application or database server, is understood to be distribution
- of the software, and therefore all GPL v2 clauses regarding distribution
- apply. For example, a web application must include a link for downloading
- the application source code.
- .
- --You are explicitly granted permission to link this software to other
- code licensed under other licenses, such as GPL v3 or the BSD license.
- Linking to a differently-licensed code base does not free this code (or
- the combination) of the stipulations of the GPLv2 plus the above clause.
+ This 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.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
@@ -56,4 +77,4 @@ License: GPL-2+
  along with this package. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index f78f876..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-
-PACKAGE_NAME=apophenia
-
-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 -- tests/Makefile
-rm --verbose --force -- test-driver
-rm --verbose --force -- depcomp
-rm --verbose --force -- install-sh
-rm --verbose --force -- ltmain.sh
-rm --verbose --force -- missing
-rm --verbose --force -- INSTALL
-rm --verbose --force -- config.sub
-rm --verbose --force -- config.guess
-## clean up
-rm --verbose --force -- apophenia.pc
-rm --verbose --force -- tests/utilities_test
-rm --verbose --force -- docs/doxyconfig
-rm --verbose --force -- docs/edit_group
-rm --verbose --force --recursive  -- eg/.libs
-rm --verbose --force --recursive  -- eg/.dirstamp
-rm --verbose --force -- eg/apop_map_row{,.log,.trs}
-rm --verbose --force -- eg/binning{,.log,.trs}
-rm --verbose --force -- eg/db_fns{,.log,.trs}
-rm --verbose --force -- eg/dconstrain{,.log,.trs}
-rm --verbose --force -- eg/dot_products{,.log,.trs}
-rm --verbose --force -- eg/draw_to_db{,.log,.trs}
-rm --verbose --force -- eg/fake_logit{,.log,.trs}
-rm --verbose --force -- eg/fix_params{,.log,.trs}
-rm --verbose --force -- eg/hills2{,.log,.trs}
-rm --verbose --force -- eg/iv{,.log,.trs}
-rm --verbose --force -- eg/jacobian{,.log,.trs}
-rm --verbose --force -- eg/ks_tests{,.log,.trs}
-rm --verbose --force -- eg/normalizations{,.log,.trs}
-rm --verbose --force -- eg/parameterization{,.log,.trs}
-rm --verbose --force -- eg/pmf_test{,.log,.trs}
-rm --verbose --force -- eg/simple_subsets{,.log,.trs}
-rm --verbose --force -- eg/some_cdfs{,.log,.trs}
-rm --verbose --force -- eg/stack_models{,.log,.trs}
-rm --verbose --force -- eg/test_distances{,.log,.trs}
-rm --verbose --force -- eg/test_fisher{,.log,.trs}
-rm --verbose --force -- eg/test_harmonic{,.log,.trs}
-rm --verbose --force -- eg/test_kl_divergence{,.log,.trs}
-rm --verbose --force -- eg/test_pruning{,.log,.trs}
-rm --verbose --force -- eg/test_ranks{,.log,.trs}
-rm --verbose --force -- eg/test_regex{,.log,.trs}
-rm --verbose --force -- eg/test_updating{,.log,.trs}
-##
-rm --verbose --force -- m4/lt~obsolete.m4
-rm --verbose --force -- m4/ltsugar.m4
-rm --verbose --force -- m4/ltoptions.m4
-rm --verbose --force -- m4/ltversion.m4
-rm --verbose --force -- m4/libtool.m4
-####rmdir --verbose --ignore-fail-on-non-empty -- m4
-rm --verbose --force -- build-aux/test-driver
-rm --verbose --force -- build-aux/depcomp
-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
-rmdir --verbose --ignore-fail-on-non-empty -- build-aux
-rm --verbose --force -- transform/Makefile.in
-rm --verbose --force -- model/Makefile.in
-rm --verbose --force -- Makefile.in
-rm --verbose --force -- cmd/Makefile.in
-rm --verbose --force -- tests/Makefile.in
-rm --verbose --force -- docs/Makefile.in
-rm --verbose --force -- eg/Makefile.in
-rm --verbose --force -- acinclude.m4
-rm --verbose --force -- aclocal.m4
-rm --verbose --force -- config.h.in
-rm --verbose --force -- configure
-#:
-
-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 -o -type d -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 f2d9829..548ec77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,4 +36,4 @@ override_dh_strip:
 	dh_strip --dbg-package=libapophenia1-dbg
 
 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 5c8101b..1f2b656 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds[\d]?//,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/apophenia-$1\.tar\.gz/ \
-https://github.com/b-k/Apophenia/tags .*/v?(\d\S*)\.tar\.gz \
-debian bash debian/repack
+opts=dversionmangle=s/\+ds[\d]?//,repacksuffix=+ds,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/apophenia-$1\.tar\.gz/ \
+https://github.com/b-k/Apophenia/tags .*/v?(\d\S*)\.tar\.gz

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

More information about the debian-science-commits mailing list