[Pkg-octave-commit] [SCM] Debian packaging for octave-msh branch, master, updated. upstream/1.0.2-10-gd1c0c0e

[Thomas Weber]

The following commit has been merged in the master branch:
commit 72207ec3e370677eb0ce46cb4137e2faba4fb28b
Author: Thomas Weber <tweber at debian.org>
Date:   Fri Sep 16 00:08:26 2011 +0200

    Explain changes between 1.0.2-2 and 1.0.2-3 upload
    
    There was an unfortunate time overlap between the works of Thomas Weber
    and Sébastien Villemot during the 1.0.2-2 release. TW uploaded the .deb
    package for 1.0.2-2, but did not push immediately. Meanwhile, SV pushed
    changes to the repository that changed the layout to the default
    git-buildpackage layout.
    
    In order to avoid unnecessary work, it was decided to upload a 1.0.2-3
    package based on the new git-buildpackage layout, incorporating all
    changes. The only drawback is that there is no tag for the 1.0.2-2
    upload in git (this should not be a real problem in the future).

diff --git a/debian/changelog b/debian/changelog
index bffec9e..9bd7876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,29 @@
-octave-msh (1.0.2-2) UNRELEASED; urgency=low
-
-  [ Colin Watson ]
-  * Add explicit build-dependency on libhdf5-openmpi-dev to work around apt
-    confusion when resolving dependencies of gmsh and octave3.2-headers
-    (closes: #639187, LP: #831407).
+octave-msh (1.0.2-3) UNRELEASED; urgency=low
 
   [ Sébastien Villemot ]
   * Bump Standards-Version to 3.9.2, no changes neeeded
   * debian/copyright: upgrade to latest draft of DEP5
   * debian/control: add myself to Uploaders
 
+  [ Thomas Weber ]
+  * Note: Due to some really unfortunate circumstances around the 1.0.2-2
+    upload (TW uploaded a 1.0.2-2 .deb, but didn't push his changes
+    immediately to git; SV changed the repository layout before noticing the
+    .deb upload), the 1.0.2-2 changelog entry below has been faked and no tag
+    exists for the 1.0.2-2 upload. As the 1.0.2-3 upload followed in less than
+    24 hours, we considered this the simplest solution.
+
  -- Sébastien Villemot <sebastien.villemot at ens.fr>  Thu, 15 Sep 2011 21:07:10 +0200
 
+octave-msh (1.0.2-2) unstable; urgency=low
+
+  [ Colin Watson ]
+  * Add explicit build-dependency on libhdf5-openmpi-dev to work around apt
+    confusion when resolving dependencies of gmsh and octave3.2-headers
+    (closes: #639187, LP: #831407).
+
+ -- Thomas Weber <tweber at debian.org>  Thu, 15 Sep 2011 17:22:01 +0200
+
 octave-msh (1.0.2-1) unstable; urgency=low
 
   * New upstream release

-- 
Debian packaging for octave-msh