Changes between Version 65 and Version 66 of BuildingDebianPackages

Timestamp:

12/11/11 17:44:53 (11 years ago)

Author:

solj

Comment:

--

BuildingDebianPackages

@@ -24 +24 @@
 === Install source code ===
 
-Depending on which version of bcfg2 you want build, you can obtain the source code from [wiki:Download] or from the project's Subversion
+Depending on which version of bcfg2 you want build, you can obtain the source code from [wiki:Download] or from the project's git
 repository.  To create a local anonymous working copy of the latest version of the bcfg2 source code, use a command like the following:
 
@@ -42 +42 @@
 The basic format of the package version string to use is this:
 
-  {{{<UPSTREAM VER>~<UPSTREAM PRE-VER>+r<UPSTREAM SVN REV>-0.1+<LOCAL VER>}}}
-
-'''NOTE: The '~', '+', and '-' characters have significance in determining when one package is newer than another.  The following format is believed to do the right thing in all common situations.'''
+  {{{<UPSTREAM VER>~<UPSTREAM PRE-VER>+<GIT-ID>-0.1+<LOCAL VER>}}}
+
+'''NOTE: The '+', and '-' characters have significance in determining when one package is newer than another.  The following format is believed to do the right thing in all common situations.'''
 
 The components of the package version string are explained below:
@@ -50 +50 @@
  `<UPSTREAM VER>`::
    This is the version of the Bcfg source code you are working from. It will likely be something like `0.9.6` or `1.0`.
- `~<UPSTREAM PRE-VER>`::
-   If you are using a published pre-release of Bcfg2, it will have a name like `pre1` or `rc1`.  Use that string here, otherwise drop this component and the preceding tilde (`~`) character from the package version string.
- `+<UPSTREAM SVN REV>`::
-   If you are building from a local working copy of the Subversion repository, it is useful to include the repository revision in the package version.  It will be a number like '5464'.  If you are building from a downloaded copy of the source, drop this component (including the preceding plus-sign (`+`) from the package version string.
+ `<UPSTREAM PRE-VER>`::
+   If you are using a published pre-release of Bcfg2, it will have a name like `pre1` or `rc1`.  Use that string here, otherwise drop this component from the package version string.
+ `+<GIT-ID>`::
+   If you are building from a local working copy of the git repository, it is useful to include the revision in the package version. If you are building from a downloaded copy of the source, drop this component (including the preceding plus-sign (`+`) from the package version string.
  `+<LOCAL VER>`::
    This is a locally relevant name like your last name or your domain name, plus the digit `1`.  For example, if your family name is ''Smith'', you could use `smith1`.  If you work for ''Example Inc'', you could use `example1`.
@@ -59 +59 @@
 Here are some examples:
 
- * If you are building packages for revision 5463 of the Subversion trunk, and the latest published version is 1.0pre5, the version string should be `1.0~pre5+r5463-0.1+example1`.
- * If you are building packages for the published 1.0 rc1 version, the version string should be `1.0~rc1-0.1+example1`.
+ * If you are building packages for revision 6c681bd from git, and the latest published version is 1.2.0rc1, the version string should be `1.2.0rc1+6c681bd-0.1+example1`.
+ * If you are building packages for the published 1.0 rc1 version, the version string should be `1.0rc1-0.1+example1`.
  * If you are building packages for the published 1.0 version, the version string should be `1.0-0.1+example1`.
 
-If you are working on a Subversion working copy of 1.0 pre5 and have the `devscripts` package installed, the following command is a convenient way to create a well formatted changelog entry:
-
-{{{
-REV=$(svn info|grep '^Revision' |cut -d' ' -f2)
-debchange --force-bad-version --preserve --newversion "1.0~pre5+r${REV}-0.1+example1" SVN revision $REV
+If you are working on a git working copy of 1.0 pre5 and have the `devscripts` package installed, the following command is a convenient way to create a well formatted changelog entry:
+
+{{{
+REV=$(git log --oneline | head -n 1 | cut -d' ' -f1)
+debchange --force-bad-version --preserve --newversion "1.0~pre5+${REV}-0.1+example1" git revision $REV
 }}}