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

[Iain Lane]

The following commit has been merged in the master branch:
commit b9868e8ead6b4db502d1291f21f3c974562fd130
Author: Iain Lane <laney at debian.org>
Date:   Wed Jan 11 23:45:46 2012 +0000

    We haven't had a -1 yet, so merge -2 entries

diff --git a/debian/changelog b/debian/changelog
index de8f5de..139a9fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-openbve (1.4.0.0-2) UNRELEASED; urgency=low
-
-  * debian/changelog: DEP5 and bump copyright to latest upstream wording
-  * debian/source/format: '3.0 (quilt)'
-  * debian/source/options: single-debian-patch
-	
- -- Paul Sladen <debian at paul.sladen.org>  Thu, 12 Jan 2012 00:07:00 +0100
-
 openbve (1.4.0.0-1) unstable; urgency=low
 
   * Initial Debian upload
@@ -15,6 +7,9 @@ openbve (1.4.0.0-1) unstable; urgency=low
     + update 'changelog.html' and 'credits.html'
     + install new modular plugins to '/usr/lib/openbve/Plugins'
     + bump openbve-data (>= 1.4.0.0) hard dependency
+  * debian/changelog: DEP5 and bump copyright to latest upstream wording
+  * debian/source/format: '3.0 (quilt)'
+  * debian/source/options: single-debian-patch
 
  -- Paul Sladen <debian at paul.sladen.org>  Wed, 11 Jan 2012 23:00:00 +0100
 

-- 
openbve