[gap-guava] 01/04: Imported Debian pre-patch 3.13+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Thu Apr 21 14:25:24 UTC 2016


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

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

commit 1fd03ab9532c20ba91f8df6ad67e509bbbd4b7fa
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Apr 18 03:03:55 2016 +0100

    Imported Debian pre-patch 3.13+ds-1
---
 debian/changelog |  13 ++++++
 debian/copyright |  38 ++++++++++++++++-
 debian/repack    | 127 -------------------------------------------------------
 debian/rules     |   2 +-
 debian/watch     |   5 +--
 5 files changed, 52 insertions(+), 133 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10137dc..2a7a6f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gap-guava (3.13+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>  Mon, 18 Apr 2016 15:40:30 +0000
+
 gap-guava (3.12+ds1-3) unstable; urgency=medium
 
   * Debianization:
diff --git a/debian/copyright b/debian/copyright
index a42c521..69f35d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,10 +5,44 @@ Source: http://www.gap-system.org/Packages/guava.html
 Comment:
  The upstream source tarball is repacked to drop off the regenarated
  material, mainly the documentation, to substantially reduce the size.
+Files-Excluded:
+ src/leon/src/Makefile
+ src/leon/autom4te.cache
+ src/leon/src/leon_config.h.in~
+ src/leon/src/leon_config.h.in
+ src/leon/src/leon_config.h
+ src/leon/compile
+ src/leon/install-sh
+ src/leon/missing
+ src/leon/aclocal.m4
+ src/leon/config.guess
+ src/leon/config.sub
+ src/leon/configure
+ src/leon/doc/leon_guava_manual.pdf
+ src/leon/doc/manual.dvi
+ src/leon/doc/manual.pdf
+ doc/chap*.txt
+ doc/chap*.html
+ doc/guava_bib.xml
+ doc/guava_bib.xml.bib
+ doc/guava.ilg
+ doc/guava.idx
+ doc/guava.ind
+ doc/guava.blg
+ doc/guava.bbl
+ doc/guava.log
+ doc/guava.toc
+ doc/guava.out
+ doc/guava.pnr
+ doc/guava.brf
+ doc/guava.aux
+ doc/guava.tex
+ doc/manual.six
+ doc/manual.pdf
 
 Files: *
 Copyright: The GUAVA Group
- 2009,2012 Joe Fields
+ 2009,2016 Joe Fields
  2007      Robert L. Miller
            Tom Boothby
  2004      David Joyner
@@ -28,7 +62,7 @@ License: GPL-2+
 
 Files: debian/*
 Copyright:
- 2014-2015 Jerome Benoit <calculus at rezozer.net>
+ 2014-2016 Jerome Benoit <calculus at rezozer.net>
  2008 Tim Abbott <tabbott at mit.edu>
 License: GPL-2+
 
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index 30115d7..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-PACKAGE_NAME=gap-guava
-
-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="+ds1"
-####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
-rm --verbose --force -- guavapage/guava.jpg
-rm --verbose --force -- guavapage/guava_light.jpg
-rm --verbose --force -- guavapage/guava.ps
-rm --verbose --force -- htm/chap*.html
-rmdir --verbose --ignore-fail-on-non-empty -- guavapage
-rmdir --verbose --ignore-fail-on-non-empty -- htm
-rm --verbose --force -- src/leon/src/Makefile
-## mimic autoreconf clean up
-rm --verbose --force --recursive -- src/leon/autom4te.cache
-rm --verbose --force -- src/leon/src/leon_config.h.in
-rm --verbose --force -- src/leon/src/leon_config.h
-rm --verbose --force -- src/leon/install-sh
-rm --verbose --force -- src/leon/missing
-rm --verbose --force -- src/leon/aclocal.m4
-rm --verbose --force -- src/leon/config.guess
-rm --verbose --force -- src/leon/config.sub
-rm --verbose --force -- src/leon/configure
-## clean up
-rm --verbose --force -- src/leon/doc/leon_guava_manual.pdf
-rm --verbose --force -- doc/chap*.txt
-rm --verbose --force -- doc/chap*.html
-####rm --verbose --force -- doc/chooser.html
-rm --verbose --force -- doc/guava.{tex,aux,brf,toc,log,bbl,blg,ind,idx,ilg}
-rm --verbose --force -- doc/guava.pnr
-rm --verbose --force -- doc/manual.six
-rm --verbose --force -- doc/manual.pdf
-####rm --verbose --force -- doc/lefttoc.css
-####rm --verbose --force -- doc/manual.{css,js}
-####rm --verbose --force -- doc/nocolorprompt.css
-####rm --verbose --force -- doc/ragged.css
-####rm --verbose --force -- doc/rainbow.js
-####rm --verbose --force -- doc/times.css
-####rm --verbose --force -- doc/toggless.{css,js}
-#:
-
-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 7c05eb7..91fc647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,4 +28,4 @@ override_dh_compress:
 	dh_compress -X.pdf
 
 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 2ade4d9..285700d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds[\d]?// \
-ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages/guava-?([\d\.]+)\.tar\.bz2 \
-debian bash debian/repack
+opts=repack,dversionmangle=s/\+ds[\d]?//,repacksuffix=+ds \
+ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages/guava-?([\d\.]+)\.tar\.bz2

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



More information about the debian-science-commits mailing list