13
13
branches="master.unstripped pristine-tar upstream upstream.unstripped"
14
14
for b in $branches; do git checkout -b $b origin/$b ; done
16
The following commands are intended to be copy&pastable.
18
- run 'SVNDATE=`date +%Y%m%d`'
19
- run 'git checkout master'
20
- run 'debian/rules get-orig-source SVN_VERSION=${SVNDATE}'
21
- run 'git-import-orig \
16
Prepare the environment:
18
SVNDATE=`date +%Y%m%d`
21
Fetch and commit the new upstream version:
23
debian/rules get-orig-source SVN_VERSION=${SVNDATE}
22
25
--debian-branch=master \
23
26
--upstream-branch=upstream \
25
29
--upstream-tag=upstream/0.svn${SVNDATE} \
26
../ffmpeg-debian_0.svn${SVNDATE}.orig.tar.gz'
27
- check and note the svn revision numbers from ffmpeg/{libswscale,}.svnrevision
29
- run 'git diff upstream^ Changelog libavcodec/allcodecs.c libavformat/allformats.c'
30
- document new formats additions in debian/changelog
31
- commit debian/changelog
32
- run 'git checkout master.unstripped'
33
- run 'git-import-orig \
30
../ffmpeg-debian_0.svn${SVNDATE}.orig.tar.gz
32
git checkout master.unstripped
34
34
--debian-branch=master.unstripped \
35
35
--upstream-branch=upstream.unstripped \
37
38
--upstream-tag=upstream.unstripped/0.svn${SVNDATE}-unstripped \
38
39
--upstream-version=0.svn${SVNDATE}-unstripped \
39
../ffmpeg_0.svn${SVNDATE}.orig.tar.gz'
40
- run 'git checkout master.unstripped'
41
- run 'git merge master'
42
- resolve the conflicts, hopefully the only conflict is in debian/changelog
40
../ffmpeg_0.svn${SVNDATE}.orig.tar.gz
44
Check and note the svn revision numbers from
45
ffmpeg/{libswscale,}.svnrevision in debian/changelog
47
git diff upstream^ Changelog libavcodec/allcodecs.c libavformat/allformats.c
49
Document new formats additions in debian/changelog
51
Build, test, and compare against the the version already in the archive:
52
- headers in the -dev packages with
53
- soname in the libraries
54
- formats.txt in the libavcodecs package
56
Finialize debian/changelog, package should be upload ready now
58
Merge improvements and changes from master branch to master.unstripped:
60
git checkout master.unstripped
63
Resolve the conflicts, hopefully the only conflict is in debian/changelog
43
64
NB: libavcodec/allcodecs.c must match upstream.unstripped!
44
- run 'git checkout master'
45
- build the package, compare against the the version already in the archive
46
- headers in the -dev packages with
47
- soname in the libraries
48
- formats.txt in the libavcodecs package
added
removed
debian/README.upstream-upgrade
