The following commit has been merged in the master branch:
commit d3c0a748b12abedd1bd1bd9af042056225be5038
Author: Hendrik Tews <hend...@askra.de>
Date:   Mon Feb 6 16:20:53 2012 +0100

    merge debian changelog entries

diff --git a/.gitignore b/.gitignore
index 1be94dc..b25c15b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-.pc
 *~
diff --git a/debian/changelog b/debian/changelog
index 8f8a229..7301315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,15 @@
-otags (3.12.1.99-2) unstable; urgency=low
+otags (3.12.2-1) unstable; urgency=low
 
-  * debhelper compat level 8
-  * use OCAML_ABI from ocamlvars.mk
-
- -- Hendrik Tews <hend...@askra.de>  Wed, 01 Feb 2012 13:27:53 +0100
-
-otags (3.12.1.99-1) unstable; urgency=low
-
-  * Imported Upstream version 3.12.1.99 
-    (which is actually a completely rewrite)
+  * Imported Upstream version 3.12.2
+    (which is actually a complete rewrite)
   * update packaging for new upstream version
   * DEP-5 compatible debian/copyright
+  * debhelper compat level 8
   * change update-otags output to /var/lib/otags/{TAGS,tags}
-  * hints from Stephane 2012-01-30
+  * followed various packaging suggestions from St├ęphane Glondu
   * add myself to Uploaders
 
- -- Hendrik Tews <hend...@askra.de>  Tue, 31 Jan 2012 16:25:59 +0100
+ -- Hendrik Tews <hend...@askra.de>  Mon, 06 Feb 2012 15:35:29 +0100
 
 otags (3.09.3.3-1) unstable; urgency=low
 

-- 
otags packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to