1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
Git main branches:
* upstream (synced from git://android.git.kernel.org/platform/external/svox.git)
* upstream+patches (from upstream): non-Debian specific patches
* debian-sid (from upstream+patches)
Quick setup:
git clone ssh://git.debian.org/git/collab-maint/svox.git
cd svox/
git branch debian-sid origin/debian-sid
git branch upstream origin/upstream
git branch upstream+patches origin/upstream+patches
git remote add android git://android.git.kernel.org/platform/external/svox.git
git fetch android
git branch android-master android/master
Quick merge:
git checkout upstream
git merge android/master
git checkout upstream+patches
git merge upstream
git checkout debian-sid
git merge upstream+patches
To build the package, run:
git-buildpackage --git-upstream-branch=upstream --git-debian-branch=debian-sid
(you can also follow https://wiki.ubuntu.com/PbuilderHowto and add the following
option: --git-builder="DIST=sid pdebuild --debbuildopts '-i\.git -I.git'")
|
