[Pkg-cli-apps-commits] [SCM] openbve branch, master, updated. debian/1.4.0.0-1-7-g8267f41

[Paul Sladen]

The following commit has been merged in the master branch:
commit 8267f419c706ec9697e5742ba9d9583f611f4ba5
Author: Paul Sladen <debian at paul.sladen.org>
Date:   Sat Jan 14 11:14:47 2012 +0100

    consolidate to 1.4.0.0-2 (untagged)

diff --git a/debian/changelog b/debian/changelog
index ffaa2a4..e52b47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openbve (1.4.0.0-3) UNRELEASED; urgency=low
+openbve (1.4.0.0-2) UNRELEASED; urgency=low
 
   * debian/filesystem.cfg: use 'SpecialFolder.LocalApplicationData'
     + emulate behaviour until upstream allows LocalApplicationData
@@ -10,14 +10,6 @@ openbve (1.4.0.0-3) UNRELEASED; urgency=low
 
  -- Paul Sladen <debian at paul.sladen.org>  Fri, 13 Jan 2012 23:00:00 +0100
 
-openbve (1.4.0.0-2) devnull; urgency=low
-
-  * Skipping: versioning screw-up, subsequently merged into -1
-  * Note: multiple git debian/1.4.0.0-1 tags in the wild,
-    3fd203d00c15ade084b170f1ce4fb1982f34d73f is what was uploaded
-
- -- Iain Lane <laney at debian.org>  Wed, 11 Jan 2012 23:00:00 +0100
-
 openbve (1.4.0.0-1) experimental; urgency=low
 
   * Initial Debian upload

-- 
openbve