Changed debian/README.source
Ankur khurana
13 years ago
| 13 | 13 | binary diffs of tarballs stored using pristine-tar. This is documented |
| 14 | 14 | below /usr/share/doc/git-buildpackage/manual-html/ . |
| 15 | 15 | |
| 16 | Upstream development is tracked both in the Git branch "upstream-git" | |
| 17 | and using upstream tarballs. | |
| 18 | 16 | |
| 19 | A custom build target shows current upstream and packaging versions: | |
| 20 | ||
| 21 | debian/rules print-version | |
| 22 | ||
| 23 | Current upstream tarball can be prepared using this other build target: | |
| 24 | ||
| 25 | debian/rules get-orig-source | |
| 26 | ||
| 27 | To switch to newer upstream source, first add a dummy changelog entry | |
| 28 | and comment out DEB_UPSTREAM_TARBALL_MD5 before getting the source: | |
| 29 | ||
| 30 | dch -v ${new_upstream_version}-1 "Dummy changelog entry" | |
| 31 | sed -i -e 's/^\(DEB_UPSTREAM_TARBALL_MD5\b\)/#\1/' debian/rules | |
| 32 | debian/rules get-orig-source | |
| 33 | ||
| 34 | Store new md5sum to help ensure identical source is received later. | |
| 35 | ||
| 36 | Before injecting a newer upstream tarball, use below commands to sync | |
| 37 | with upstream Git, to adopt upstream commit messages and to minimize | |
| 38 | size of our Git. | |
| 39 | ||
| 40 | The following commands updates the local mirror of upstream source: | |
| 41 | ||
| 42 | git checkout upstream-git | |
| 43 | git pull | |
| 44 | git fetch --tags | |
| 45 | ||
| 46 | The following command shows upstream changes possibly relevant to merge | |
| 47 | or cherry-pick (replace leading "upstream" with "HEAD^" and invoke | |
| 48 | immediately after syncing to show recently merged changes possibly | |
| 49 | relevant to mention in our changelog): | |
| 50 | ||
| 51 | git log --pretty="format:%h %s" upstream..upstream-git | |
| 52 | ||
| 53 | The following commands merges all upstream changes with our packaging | |
| 54 | branches (to skip newest upstream changes, replace dot in first pull | |
| 55 | command with either a tag or an explicit commit hash): | |
| 56 | ||
| 57 | git checkout upstream | |
| 58 | git pull . upstream-git | |
| 59 | git checkout master | |
| 60 | git pull . upstream | |
| 61 | ||
| 62 | If git-import-orig fails complaining about no changes, revert both pulls | |
| 63 | (using "git reset --hard HEAD^" in both master and upstream branches), | |
| 64 | and try again skipping the very newest changes to cheat git-import-orig. | |
| 65 | ||
| 66 | To do a package release from upstream Git snapshot, first look at | |
| 67 | upstream development for a good place to release, and tag by its date, | |
| 68 | replacing "~" with "." to mimic git-buildpackage logic (replace | |
| 69 | timestamp and commit hash below with real ones based on chosen commit). | |
| 70 | ||
| 71 | git log --abbrev-commit upstream-git | |
| 72 | git tag -s -m "Upstream snapshot" upstream/0.2.git20080130 61279f8 | |
| 73 | dch -r -v "0.2~git20080130-1" "New upstream Git snapshot." | |
| 74 | 17 | |
| 75 | 18 | Setting DEB_MAINTAINER_MODE=1 enables additional build routines helpful |
| 76 | 19 | during development of the package, but unfit for normal builds. This |