[SCM] mplayer/master: simplify/remove instruction to get upstream sources

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Feb 13 09:28:30 UTC 2011


The following commit has been merged in the master branch:
commit f6ff54869b717d8c931fe43a1fa5fb5d905b514b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 10:28:11 2011 +0100

    simplify/remove instruction to get upstream sources
    
    we now just track upstream releases, the old instructions were for
    tracking upstream svn. Upstream svn stuff can be tracked from
    https://launchpad.net/~motumedia/+archive/mplayer-daily/+packages

diff --git a/debian/README.source b/debian/README.source
index d9b7ea1..7ca5ebc 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,11 +1,5 @@
 The sources of this mplayer package have some parts removed!
 
-* In order to update the package yourself and/or to review the changes done
-  to the source code, please see the files:
-
-   debian/README.upstream-upgrade
-   debian/get-orig-source.sh
-
 * In particular, the internal libdvdcss library was deleted, so the mplayer
   package provided by Debian is unable to play encrypted DVDs. If you want to
   play encrypted DVDs (i.e. almost all available Video-DVDs), please follow
@@ -14,4 +8,4 @@ The sources of this mplayer package have some parts removed!
 
 A. Mennucc with adaptions by Reinhard Tartler and Fabian Greffrath
 
- -- Reinhard Tartler <siretart at tauware.de>, Thu,  3 Jun 2010 18:25:09 +0200
+ -- Reinhard Tartler <siretart at tauware.de>, Sun, 13 Feb 2011 09:55:32 +0100
diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
deleted file mode 100644
index 65f2166..0000000
--- a/debian/README.upstream-upgrade
+++ /dev/null
@@ -1,44 +0,0 @@
-Checklist and howto for mplayer upstream upgrades:
-
-Needed packages:
-
-  apt-get install devscripts git-buildpackage pristine-tar
-
-Stage in a tmp directory:
-
-  mkdir /tmp/m ; cd /tmp/m
-  git clone git://git.debian.org/git/pkg-multimedia/mplayer.git
-  cd mplayer
-  branches="master.unstripped pristine-tar upstream upstream.unstripped"
-  for b in $branches; do git checkout -b $b origin/$b ; done
-
-Prepare the environment:
-
-  SVNDATE=`date +%Y%m%d`
-  git checkout master
-
-Fetch and commit the new upstream version:
-
-  debian/rules get-orig-source SVN_VERSION=${SVNDATE}
-  git-import-orig \
-            --debian-branch=master \
-            --upstream-branch=upstream \
-            --pristine-tar \
-            --no-dch \
-            --upstream-version=1.0~rc3+svn${SVNDATE} \
-            --upstream-tag=upstream/1.0rc3+svn${SVNDATE} \
-            ../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-
-  git checkout master.unstripped
-  git-import-orig \
-            --debian-branch=master.unstripped \
-            --upstream-branch=upstream.unstripped \
-            --pristine-tar \
-            --no-dch \
-            --upstream-tag=upstream.unstripped/1.0rc3+svn${SVNDATE}-unstripped \
-            --upstream-version=1.0~rc3+svn${SVNDATE}-unstripped \
-            ../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-
-  git checkout master
-
-more comments will follow..
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100644
index 8b7a271..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#
-#  Script to create a 'pristine' tarball for the debian mplayer source package
-#  Copyright (C) 2009, 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 2 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
-  -d : svn date
-EOF
-}
-
-debug () {
-	$DEBUG && echo "DEBUG: $*" >&2
-}
-
-error () {
-	echo "$1" >&2
-	exit 1;
-}
-
-set +e
-PARAMS=`getopt hd: "$@"`
-if test $? -ne 0; then usage; exit 1; fi;
-set -e
-
-eval set -- "$PARAMS"
-
-DEBUG=false
-SVNDATE=
-
-while test $# -gt 0
-do
-	case $1 in
-		-h) usage; exit 1 ;;
-		-d) SVNDATE=$2; shift ;;
-		--) shift ; break ;;
-		*)  echo "Internal error!" ; exit 1 ;;
-	esac
-	shift
-done
-
-# sanity checks now
-dh_testdir
-
-if [ -z $SVNDATE ]; then
-	error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
-fi
-
-TARBALL=`pwd`/../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-TARBALL_UNSTRIPPED=`pwd`/../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-PACKAGENAME=mplayer
-
-TMPDIR=`mktemp -d`
-trap 'rm -rf ${TMPDIR}'  EXIT
-
-baseurl="svn://svn.mplayerhq.hu/mplayer/branches/1.0rc3"
-
-svn export -r{${SVNDATE}} \
-	--ignore-externals \
-	${baseurl}  \
-	${TMPDIR}/${PACKAGENAME}
-
-svn info -r{${SVNDATE}} \
-	${baseurl} \
-	| awk '/^Revision/ {print $2}' \
-	> ${TMPDIR}/${PACKAGENAME}/.svnrevision
-
-# get svn externals
-svn pg svn:externals $baseurl | grep -v libswscale | \
-while read external url; do
-    [ -z $url ] && continue
-    dest="${TMPDIR}/${PACKAGENAME}/${external}"
-    svn export -r{${SVNDATE}} --ignore-externals $url $dest
-    svn info $url -r{${SVNDATE}} \
-      | awk '/^Revision/ {print $2}' > ${dest}/.svnrevision
-done
-
-# for mplayer release branches, libswscale is special since it contains
-# svn revision options. The revision below needs manual syncing with
-# upstream's svn.
-
-# TODO: find some way to integrate this in the while loop above
-
-dest="${TMPDIR}/${PACKAGENAME}/libswscale"
-revision=28777
-svn export -r $revision svn://svn.ffmpeg.org/mplayer/trunk/libswscale $dest
-echo $revision > ${dest}/.svnrevision
-
-# this doesn't belong in strip.sh, because the unstripped source should
-# have this directory renamed as well.
-( cd ${TMPDIR}/${PACKAGENAME} && rm -rfv debian )
-
-( cd ${TMPDIR}/ && mv ${PACKAGENAME} ${PACKAGENAME}-${SVNDATE} )
-
-tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
-	
-( cd ${TMPDIR}/${PACKAGENAME}-${SVNDATE} && rm -rfv libdvdcss )
-
-tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
-
-# print diff
-( cd ${TMPDIR} && ptardiff ${TARBALL_UNSTRIPPED} ) | tee ${TARBALL}.diff

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list