[SCM] devede/master: Get rid of repackaging
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Nov 7 12:52:22 UTC 2015
The following commit has been merged in the master branch:
commit 65c13162b8174dbd06b7cbf3c88d4028f8fe6536
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date: Sat Nov 7 12:49:24 2015 +0000
Get rid of repackaging
It is no longer necessary.
diff --git a/debian/repack.local b/debian/repack.local
deleted file mode 100644
index 2650f0d..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,5 +0,0 @@
-SUFFIX=~ds1
-rm debian/ \
- build/ \
- locale/ \
- html/menu.html~
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index ae71ef5..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/sh
-
-# see the repack.stub for how to use
-
-# TODO: provide example watch files and repack.locals
-# TODO: test suite. problems fixed that need to be tested:
-# * globbing
-# * whitespace and then comments in the MANIFEST
-# TODO: does / in weird places work? test suite too.
-# TODO: I actually broke stuff with the MANIFEST change not thinking..
-# TODO: allow for a sepearate (and multiple) MANIFEST files, then
-# de-uglify libsyntax-highlight-engine-kate-perl.
-# TODO: have each mv and rm check that something actually changed, and
-# if not, die
-
-set -e
-set -u
-
-usage() {
- echo "Usage: repack.sh --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
-VER="$2"
-FILE="$3"
-PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
-
-SUFFIX="+dfsg"
-
-echo
-echo "Repackaging $FILE"
-echo
-
-DIR=`mktemp -d ./tmpRepackXXXXXX`
-DIR=$(readlink -f "$DIR")
-trap "/bin/rm -rf \"$DIR\"" QUIT INT EXIT
-
-# Create an extra directory to cope with rootless tarballs
-UP_BASE="$DIR/unpack"
-mkdir "$UP_BASE"
-tar xf "$FILE" -C "$UP_BASE" || unzip "$FILE" -d "$UP_BASE"
-
-if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
- # Tarball does contain a root directory
- UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
-fi
-
-RM_OPTS="-vrf"
-
-real_rm(){
- /bin/rm "$@"
-}
-
-real_mv(){
- /bin/mv "$@"
-}
-
-rm(){
- set +f
- MYOLDPWD=$(pwd)
- cd "$UP_BASE"
- if [ "$MANIFEST" = "1" ]; then
- PERM=$(stat --format=%a "MANIFEST")
- chmod u+w "MANIFEST"
- fi
- for i in $@; do
- if [ "$MANIFEST" = "1" ]; then
- PATTERN="^$i"
- if [ -d "$i" ]; then
- if ! { echo "$PATTERN" | grep -q "/$" ; }; then
- PATTERN="${PATTERN}/"
- fi
- else
- PATTERN="${PATTERN}\s?"
- fi
- grep -Ev "$PATTERN" "MANIFEST" > "$DIR/MANIFEST"
- real_mv "$DIR/MANIFEST" "MANIFEST"
- fi
- real_rm "$RM_OPTS" "$i"
- done
- if [ "$MANIFEST" = "1" ]; then
- chmod $PERM "MANIFEST"
- fi
- cd $MYOLDPWD
- set -f
-}
-
-mv(){
- set +f
- OLD=$(pwd)
- cd $UP_BASE
- real_mv "$@"
- cd $OLD
- if [ "$MANIFEST" = "1" ]; then
- echo "MANIFEST cannot be manipulated with mv yet, patches welcome"
- exit 1
- fi
- set -f
-}
-
-# bump with incompatible changes
-REPACK_VERSION=3
-
-requires_version(){
- if [ $REPACK_VERSION -lt $1 ]; then
- echo "repack.sh is not up to date enough for this package. you need at least version $1, while this script is only version $REPACK_VERSION"
- exit 1
- fi
-}
-
-MANIFEST=0
-## Remove stuff
-set -f
-MYORIGPWD=$(pwd)
-cd "$UP_BASE"
-. "$MYORIGPWD/debian/repack.local"
-cd $MYORIGPWD
-set +f
-## End
-
-REPACK_DIR="$PKG-${VER}${SUFFIX}.orig" # DevRef § 6.7.8.2
-DFSG_TAR="$(dirname $FILE)/${PKG}_${VER}${SUFFIX}.orig.tar"
-
-real_mv "$UP_BASE" "$DIR/$REPACK_DIR"
-
-# .gz or .bz2?
-FILETYPE=$(file --brief --mime-type --dereference "$FILE")
-case "$FILETYPE" in
- application/x-gzip|application/zip)
- C_PROGRAM="gzip"
- C_SUFFIX="gz"
- ;;
- application/x-bzip2)
- C_PROGRAM="bzip2"
- C_SUFFIX="bz2"
- ;;
- *)
- echo "E: Unknown filetye $FILETYPE"
- exit 1
- ;;
-esac
-
-# Using a pipe hides tar errors!
-tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
-$C_PROGRAM -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.$C_SUFFIX"
-
-real_mv "$DIR/repacked.tar.$C_SUFFIX" "$DFSG_TAR.$C_SUFFIX"
-
-echo "*** $DFSG_TAR.$C_SUFFIX ready"
diff --git a/debian/repack.stub b/debian/repack.stub
deleted file mode 100644
index ac56520..0000000
--- a/debian/repack.stub
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-: <<=cut
-=pod
-
-=head1 NAME
-
-repack.stub - script to repack upstream tarballs from uscan
-
-=head1 INSTRUCTIONS
-
-put this in debian/repack.stub and add "debian sh debian/repack.stub" to
-the end of the line in debian/watch. you will also need to add a version
-mangle to debian/watch.
-
-then create a debian/repack.local. this is a shell script that is
-sources under "set -e", so be careful to check returns codes.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item rm
-
-rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item mv
-
-mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item requires_version
-
-requires_version is there for future usage for requiring certain versions of the script
-
-=back
-
-=head1 VARIABLES
-
-=over 4
-
-=item SUFFIX
-
-defaults to +dfsg
-
-what to append to the upstream version
-
-=item RM_OPTS
-
-defaults to -vrf
-
-options to pass to rm
-
-=item MANIFEST
-
-defaults to 0, set to 1 to turn on.
-
-this will manipulate MANIFEST files in CPAN tarballs.
-
-=item UP_BASE
-
-this is the directory where the upstream source is.
-
-=back
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
- if [ -f ../../scripts/repack.sh ]; then
- REPACK_SH=../../scripts/repack.sh
- fi
- if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
- REPACK_SH=$(which repack.sh)
- fi
-fi
-
-if [ ! -f "$REPACK_SH" ]; then
- echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
- echo "You can get it from http://svn.debian.org/viewsvn/pkg-perl/scripts/repack.sh"
- exit 1
-fi
-
-exec "$REPACK_SH" "$@"
diff --git a/debian/rules b/debian/rules
index f1f146a..fcc77b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-export REPACK_SH=$(CURDIR)/debian/repack.sh
-
%:
dh $@ --with python2,scour
@@ -17,6 +15,3 @@ override_dh_clean:
override_dh_install:
dh_install -Xdevedesans.ttf
rm -f debian/devede/usr/share/doc/devede/html/menu.html~
-
-get-orig-source:
- uscan --force-download --repack
diff --git a/debian/watch b/debian/watch
index f8fa20a..ac4ad00 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,5 +2,4 @@ version=3
opts=\
filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/devedeng-$1\.tar\.gz/,\
dversionmangle=s/~ds.*// \
- https://github.com/rastersoft/devedeng/tags .*/v?(\d\S*)\.tar\.gz \
- debian sh debian/repack.stub
+ https://github.com/rastersoft/devedeng/tags .*/v?(\d\S*)\.tar\.gz
--
devede packaging
More information about the pkg-multimedia-commits
mailing list