[Pkg-octave-commit] r980 - www

[Rafael Laboissiere]

Author: rafael
Date: 2007-07-19 17:42:02 +0000 (Thu, 19 Jul 2007)
New Revision: 980

Modified:
   www/DOG-Guidelines.txt
Log:
* Changed requirements on the trailer line and distribution tag in
  debian/changelog for SVN commits that do not correspond to released
  versions of the package. 
* Removed comments regarding editing debian/changelog with Emacs


Modified: www/DOG-Guidelines.txt
===================================================================
--- www/DOG-Guidelines.txt	2007-07-19 01:18:45 UTC (rev 979)
+++ www/DOG-Guidelines.txt	2007-07-19 17:42:02 UTC (rev 980)
@@ -45,28 +45,6 @@
 is the common practice in Debian, being the format adopted in core packages
 like libc6 and xorg-x11.
 
-At the end of debian/changelog put the following lines::
-
-    Local Variables:
-    eval: (progn
-      (make-local-hook 'debian-changelog-add-version-hook)
-      (add-hook
-        'debian-changelog-add-version-hook
-          (lambda ()
-          (save-excursion
-            (forward-line -1)
-            (beginning-of-line)
-            (insert "\n  NOT YET RELEASED!\n\n  [ "
-              (or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
-        nil t))
-    End:
-
-This is a great help when using (X)Emacs with the debian-changelog-mode and
-hitting [(control) c] [(control) v] for starting a new version entry of
-[(control) c] [(control) c] for closing an opened version entry.  Notice
-that for the "eval" code above to work, version 24.12-1 or later of the
-dpkg-dev-el must be installed.
-
 If you are a Debian developer, put your name in the Uploaders field of
 debian/control.  By doing this, your uploads will not be considered as NMUs
 (non-maintainer uploads).
@@ -92,7 +70,7 @@
 http://lists.alioth.debian.org/mailman/listinfo/pkg-octave-commit
 
 Bugs marked as *closed* in debian/changelog will be tagged *pending*
-automatically when you commit your changes into SVN. 
+automatically when you commit your changes into SVN.
 
 The repository is organized in a svn-buildpackage-friendly way, as follows::
 
@@ -207,24 +185,25 @@
 
 When committing changes that do not result in a Debian release, keep
 debian/changelog in a clearly broken state, such that the other developers
-will know that the version is not yet released.  Something like this::
+will know that the version is not yet released.  The preferable way of
+doing this is by setting the distribution to "UNRELEASED", like this::
 
-    octave-cool (1.2.3-4) unstable; urgency=low
+    octave-cool (1.2.3-4) UNRELEASED; urgency=low
 
-      NOT YET RELEASED!
-
       [ Joe Developer ]
       * First import
 
-    --
+    -- Joe Developer <joedev at debian.org>  Mon,  15 Oct 2012 08:30:00 -0400
 
-In (X)Emacs, the text shown above is automatically inserted, thanks to the
-"eval" code in the "Local Variables" section of the file (see section 2).
+Notice that the trailer line should be kept in the changelog entry.  This
+has the following advantages: first, it keeps the package in a buildable
+state from a SVN checkout.  In addition, the trailer line shows the name of
+the developer who effectively prepared that version of the package and
+which will appear in the "Changed-By:" field of the *.changes file.  The
+change from "UNRELEASED" to "unstable" (or any other valid distribution)
+should be done by the developer who does the actual upload.
 
-Notice the absence of signature and release date.  dpkg-buildpackage will
-refuse to build a package with such an entry at the top of debian/changelog.
 
-
 4. Centralized installation paths and octave2.1 dependency
 ----------------------------------------------------------