On Tue, Jul 20, 2010 at 17:42:51 (CEST), [email protected] wrote:
> The following commit has been merged in the master branch: > commit e93b6ff9e70186f5fafef5e1c3da94d07829872c > Author: Matthias Klumpp <[email protected]> > Date: Tue Jul 20 17:42:18 2010 +0200 > > Added get-orig-source script > > * Included script to build a DFSG-compliant > tarball from original upstream tar. > > diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh > new file mode 100755 > index 0000000..31ac732 > --- /dev/null > +++ b/debian/get-orig-source.sh > @@ -0,0 +1,101 @@ > +#!/bin/sh > +# > +# Script to create a 'pristine' tarball for the debian projectM source > package > +# Copyright (C) 2010 Matthias Klumpp > +# based on script by Reinhard Tartler > +# > +# This program 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. > +# > +# This program 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, write to the Free Software Foundation, Inc., > +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + > +set -eu > + > +usage() { > + cat >&2 <<EOF > +usage: $0 [-dh] > + -h : display help > + -t : original upstream tarball > + -o : output tarball name > + -v : upstream version > + -c : path to cleanup script > +EOF > +} > + > +debug () { > + $DEBUG && echo "DEBUG: $*" >&2 > +} > + > +error () { > + echo "$1" >&2 > + exit 1; > +} > + > +set +e > +PARAMS=`getopt ht:v: "$@"` > +if test $? -ne 0; then usage; exit 1; fi; > +set -e > + > +eval set -- "$PARAMS" > + > +DEBUG=false > +USVERSION=2.0.1 > + > +while test $# -gt 0 > +do > + case $1 in > + -h) usage; exit 1 ;; > + -t) ORIGTAR=$2; shift ;; > + -v) USVERSION=$2; shift ;; > + --) shift ; break ;; > + *) echo "Internal error!" ; exit 1 ;; > + esac > + shift > +done > + > +# sanity checks now > +dh_testdir > + > +if [ -z $ORIGTAR ]; then > + error "you need to specify the original upstream tarball!" > +fi this totally changes the semantics of what I'd expect from a get-orig-source target. The purpose of the get-orig-source.sh script was to fetch the source from the internet, while strip.sh is meant to be run in the temporary directory and is called by get-orig-source.sh. Please either follow that philosophy or rename the script to something that matches its intend better in order to avoid future confusion. thanks. > + > +PACKAGENAME=projectm > +TARBALL="./${PACKAGENAME}_${USVERSION}+dfsg.orig.tar.gz" > + > +TMPDIR=`mktemp -d` > +trap 'rm -rf ${TMPDIR}' EXIT > + > +mkdir ${TMPDIR}/${PACKAGENAME} > +ODIR=`pwd` > +cd ${TMPDIR}/${PACKAGENAME} > +tar xzf ${ORIGTAR} > +cd projectM-complete-${USVERSION}-Source > + > +rm -rf ./src/WinLibs > +rm -rf ./src/macos > +rm -rf ./src/win32 > +rm -f ./src/projectM-sdlvis/a.out > +rm -rf ./presets_test > +rm -f ./INSTALL-iTunes-macos.txt > +rm -rf ./playlists > +rm -rf ./src/projectM-iTunes-VizKit > +rm -rf ./src/projectM-iTunes > +rm -rf ./src/projectM-moviegen > +rm -rf ./src/projectM-screensaver > +rm -rf ./src/projectM-wmp > +find . -type d -name CVS -exec rm -rf {} + > +find . -type d -name *~ -exec rm {} + > + > +cd ${ODIR} > + > +tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME} > diff --git a/debian/rules b/debian/rules > index 0523ceb..86ee035 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -13,7 +13,7 @@ BUILD_DIR=$(CURDIR)/src/build > %: > dh $@ > > -.PHONY: override_dh_strip > +.PHONY: override_dh_strip get-orig-source is this intentional? I don't see a get-orig-source target here? > > override_dh_auto_clean: > [ ! -f $(BUILD_DIR) ] || $(MAKE) --directory=$(BUILD_DIR) clean > @@ -37,12 +37,3 @@ override_dh_auto_install: > > override_dh_strip: > dh_strip --dbg-package=projectm-dbg > - > -upstream: > - rm -rf $(CURDIR)/src/WinLibs > - rm -rf $(CURDIR)/src/macos > - rm -rf $(CURDIR)/src/win32 > - rm -f $(CURDIR)/src/projectM-sdlvis/a.out > - rm -rf $(CURDIR)/presets_test > - find . -type d -name CVS -exec rm -rf {} + > - find . -type d -name *~ -exec rm {} + -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 _______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
