← Back to branch summary

~ubuntu-branches/ubuntu/precise/ffmpeg-debian/precise

« back to all changes in this revision

Viewing changes to debian/README.upstream-upgrade

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-07-18 10:55:24 UTC
  • mfrom: (1.1.6 upstream) (0.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090718105524-joadmuw3zpqxlitc
Tags: 4:0.5+svn20090609-1ubuntu1
* merge from debian. Remaining changes:
  - don't build-depend on libfaad-dev, disabling faad decoder.
  - build arm vfp variant
* update gbp.conf
* move gbp.conf to debian/

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/README.upstream-upgrade
26
26
            --upstream-branch=upstream \
27
27
            --pristine-tar \
28
28
            --no-dch \
29
 
            --upstream-tag=upstream/0.svn${SVNDATE} \
30
 
            ../ffmpeg-debian_0.svn${SVNDATE}.orig.tar.gz
 
29
            --upstream-tag=upstream/0.5+svn${SVNDATE} \
 
30
            --upstream-version=0.5+svn${SVNDATE} \
 
31
            ../ffmpeg-debian_0.5+svn${SVNDATE}.orig.tar.gz
 
32
 
 
33
  # ffmpeg (formerly ffmpeg-debian) and ffmpeg-extra share the same tarball now
 
34
  cp ../ffmpeg-debian_0.5+svn${SVNDATE}.orig.tar.gz \
 
35
     ../ffmpeg_0.5+svn${SVNDATE}.orig.tar.gz
31
36
 
32
37
  git checkout master.unstripped
33
38
  git-import-orig \
35
40
            --upstream-branch=upstream.unstripped \
36
41
            --pristine-tar \
37
42
            --no-dch \
38
 
            --upstream-tag=upstream.unstripped/0.svn${SVNDATE}-unstripped \
39
 
            --upstream-version=0.svn${SVNDATE}-unstripped \
40
 
            ../ffmpeg_0.svn${SVNDATE}.orig.tar.gz
 
43
            --upstream-tag=upstream.unstripped/0.5+svn${SVNDATE} \
 
44
            --upstream-version=0.5+svn${SVNDATE} \
 
45
            ../ffmpeg_0.5+svn${SVNDATE}.orig.tar.gz
41
46
 
42
47
  git checkout master
43
48