debian/README.VCS-source | 90 +++++++++++++++++++++++++++++++++++++++++++++++ debian/README.source | 10 +++++ debian/gbp.conf | 2 + 3 files changed, 102 insertions(+)
New commits: commit a2dc57a7bdb824cd4019c5150a3e8df13669cebe Author: Julien Viard de Galbert <[email protected]> Date: Sun Oct 24 13:39:28 2010 +0200 Enabling pristine-tar diff --git a/debian/README.VCS-source b/debian/README.VCS-source index b7b7d51..c29b8e5 100644 --- a/debian/README.VCS-source +++ b/debian/README.VCS-source @@ -46,13 +46,45 @@ git remote add xsfbs git://git.debian.org/pkg-xorg/xsfbs.git git fetch xsfbs +-------------------- +Building the package +-------------------- + +With the workdir prepared as explained above, all you need to build the package +is to run git-buildpackage. The configuration file in debian/gbp.conf already +takes cake of setting the needed options. + +Warning: the debian/gbp.conf file is different in debian-unstable and +debian-experimental, as it contains the name of those branches and the +corresponding upstream-* branch. So one must take care of this when merging +changes between those two branches. + ---------------------- Updating from upstream ---------------------- New upstream revisions are fetched with git-svn [1] then the changes are merged to one of the upstream-* branches with git [2]. Then the regular -git usage to merge to the debian-* branches can be used. +git usage to merge to the debian-* branches can be used. However the package +is configured to use pristine-tar by default, so in order to compile your +newly fetched version with git-buildpackage you will have to disable it [3]. 1: git svn fetch 2: git merge trunk +3: git-buildpackage --git-no-pristine-tar + +Once the package is ready, before uploading to the archive, the pristine-tar +branch should be updated, simply use the 'pristine-tar commit' command to add +the tarball git-buildpackage generated to the git repository. +For example if you're updating a version targeting unstable, the command would +be as follows [4]: + +4: pristine-tar commit ../xserver-xorg-video-openchrome_*.orig.tar.gz upstream-unstable + +This step is required so that next debian version of the same upstream version +can be generated by other developers without the need to retrieve the original +tarball from the archive or from snapshot.debian.org but simply by using the +git repository. +Note: When the revision matches an upstream release, it would be appreciated to +use the official release tarball instead, if possible. + diff --git a/debian/gbp.conf b/debian/gbp.conf index 06b4e88..9a1a1bf 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,3 +3,5 @@ upstream-branch=upstream-experimental # the default branch for the debian patch debian-branch=debian-experimental +# enable pristine-tar support +pristine-tar=true commit 922f455f7e6d597d1af28cfea9633754c419c836 Author: Julien Viard de Galbert <[email protected]> Date: Sun Oct 24 12:25:09 2010 +0200 Documenting git-svn usage to fetch from upstream. diff --git a/debian/README.VCS-source b/debian/README.VCS-source new file mode 100644 index 0000000..b7b7d51 --- /dev/null +++ b/debian/README.VCS-source @@ -0,0 +1,58 @@ +----------------------------------------- +Guide to preparing your working directory +----------------------------------------- + +Debian X Strike Force team maintains packages in git repositories, +openchrome upstream maintains the code in subversion. This will show how to +setup git-svn to work on xserver-xorg-video-openchrome and fetch new +revisions from upstream. + +1. Clone the debian package repository: + (if you have access to it you can clone with ssh too.) + +git clone git://git.debian.org/pkg-xorg/driver/xserver-xorg-video-openchrome.git + +2. Enter the newly created directory before continuing. + +cd xserver-xorg-video-openchrome + +3. Setup the subversion tracking for openchrome trunk + (if you need the branches and tags, then replace "-T trunk" by "--stdlayout") + +git svn init http://svn.openchrome.org/svn/ -T trunk + +4. *Optional step* speed-up the svn fetch by updating manually the trunk's + remote reference. + - Find latest svn commit in history (I did it graphically) + +gitk --all & + + - Change the trunk's remote reference: + +git update-ref refs/remotes/trunk <git-commit-id> + +5. Fetch subversion history + +git svn fetch + + Note: for some reason git-svn will create a master branch if none existed, + it can be ignored, only the refs/remotes/trunk is important. + +6. Setup and other remote branch for xsfbs + +git remote add xsfbs git://git.debian.org/pkg-xorg/xsfbs.git + +7. And fetch it + +git fetch xsfbs + +---------------------- +Updating from upstream +---------------------- + +New upstream revisions are fetched with git-svn [1] then the changes are +merged to one of the upstream-* branches with git [2]. Then the regular +git usage to merge to the debian-* branches can be used. + +1: git svn fetch +2: git merge trunk diff --git a/debian/README.source b/debian/README.source index b09a1ab..f5d52a1 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,3 +1,13 @@ +xserver-xorg-video-openchrome packages are not based on openchrome releases +tarballs but on openchrome subversion repository. + +Refer to the README.VCS-source file for details on how to setup git and +git svn to fetch from both git.debian.org and svn.openchrome.org + +This packages also uses the X Strike Force Build System (xfsbs). +The rest of this file comes from xfsbs and is left unmodified to ease later +merges. + ------------------------------------------------------ Quick Guide To Patching This Package For The Impatient ------------------------------------------------------ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
