[Pkg-ocaml-maint-commits] r1762 - in trunk/packages/coq/trunk: . debian debian/patches

[Samuel Mimram]

Author: smimram-guest
Date: 2005-09-07 19:32:56 +0000 (Wed, 07 Sep 2005)
New Revision: 1762

Added:
   trunk/packages/coq/trunk/debian/patches/text_view_typing_error.dpatch
   trunk/packages/coq/trunk/debian/svn-deblayout
Removed:
   trunk/packages/coq/trunk/coq_8.0pl2.orig.tar.gz
Modified:
   trunk/packages/coq/trunk/debian/
   trunk/packages/coq/trunk/debian/changelog
   trunk/packages/coq/trunk/debian/patches/00list
   trunk/packages/coq/trunk/debian/rules
Log:
Switching to svn-buildpackage.
Added a patch to solve the FTBFS.


Deleted: trunk/packages/coq/trunk/coq_8.0pl2.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/coq/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/coq/trunk/debian/changelog
===================================================================
--- trunk/packages/coq/trunk/debian/changelog	2005-09-07 19:32:24 UTC (rev 1761)
+++ trunk/packages/coq/trunk/debian/changelog	2005-09-07 19:32:56 UTC (rev 1762)
@@ -1,3 +1,11 @@
+coq (8.0pl2-3) unstable; urgency=low
+
+  * Added text_view_typing_error patch to avoid a typing error and solve the
+    FTBFS, closes: #326740.
+  * Added forgotten call to dh_installmenu.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed,  7 Sep 2005 21:26:36 +0200
+
 coq (8.0pl2-2) unstable; urgency=medium
 
   * Rebuilding with OCaml 3.08.3 is necessary because of the former dependency

Modified: trunk/packages/coq/trunk/debian/patches/00list
===================================================================
--- trunk/packages/coq/trunk/debian/patches/00list	2005-09-07 19:32:24 UTC (rev 1761)
+++ trunk/packages/coq/trunk/debian/patches/00list	2005-09-07 19:32:56 UTC (rev 1762)
@@ -0,0 +1 @@
+text_view_typing_error

Added: trunk/packages/coq/trunk/debian/patches/text_view_typing_error.dpatch
===================================================================
--- trunk/packages/coq/trunk/debian/patches/text_view_typing_error.dpatch	2005-09-07 19:32:24 UTC (rev 1761)
+++ trunk/packages/coq/trunk/debian/patches/text_view_typing_error.dpatch	2005-09-07 19:32:56 UTC (rev 1762)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## text_view_typing_error.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid a typing error with recent versions of lablgtk2.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./ide/undo.ml /tmp/dpep-work.h2rZKK/coq-8.0pl2/ide/undo.ml
+--- ./ide/undo.ml	2004-07-16 21:30:21.000000000 +0200
++++ /tmp/dpep-work.h2rZKK/coq-8.0pl2/ide/undo.ml	2005-09-07 21:19:54.000000000 +0200
+@@ -18,7 +18,7 @@
+   | Insert (s,i,l) -> Delete (s,i,l)
+   | Delete (s,i,l) -> Insert (s,i,l)
+ 
+-class undoable_view (tv:Gtk.text_view Gtk.obj) =
++class undoable_view (tv:[> Gtk.text_view ] Gtk.obj) =
+   let undo_lock = ref true in 
+ object(self)
+   inherit GText.view tv as super
+diff -urNad --exclude=CVS --exclude=.svn ./ide/undo.mli /tmp/dpep-work.h2rZKK/coq-8.0pl2/ide/undo.mli
+--- ./ide/undo.mli	2005-01-21 18:21:33.000000000 +0100
++++ /tmp/dpep-work.h2rZKK/coq-8.0pl2/ide/undo.mli	2005-09-07 21:20:07.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ (* An undoable view class *)
+ 
+-class undoable_view : Gtk.text_view Gtk.obj ->
++class undoable_view : [> Gtk.text_view ] Gtk.obj ->
+ object
+   inherit GText.view
+   method undo : bool


Property changes on: trunk/packages/coq/trunk/debian/patches/text_view_typing_error.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/coq/trunk/debian/rules
===================================================================
--- trunk/packages/coq/trunk/debian/rules	2005-09-07 19:32:24 UTC (rev 1761)
+++ trunk/packages/coq/trunk/debian/rules	2005-09-07 19:32:56 UTC (rev 1762)
@@ -99,6 +99,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs
+	dh_installmenu
 	dh_installemacsen
 	dh_installman
 	dh_installchangelogs CHANGES

Added: trunk/packages/coq/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/coq/trunk/debian/svn-deblayout	2005-09-07 19:32:24 UTC (rev 1761)
+++ trunk/packages/coq/trunk/debian/svn-deblayout	2005-09-07 19:32:56 UTC (rev 1762)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/coq/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/coq