From d89cdcc0a10fa354e6bf466b7d68224bb6e54b61 Mon Sep 17 00:00:00 2001 From: Samuel Mimram Date: Thu, 19 Jan 2006 22:34:29 +0000 Subject: Getting ready for the new release. --- debian/changelog | 8 +++++-- debian/control | 2 +- debian/coq.install | 1 + debian/coqide.dirs | 1 + debian/coqide.install | 3 ++- debian/coqide.menu | 2 +- debian/patches/00list | 2 -- debian/patches/ocaml309.dpatch | 24 --------------------- debian/patches/text_view_typing_error.dpatch | 31 ---------------------------- debian/rules | 8 +++++++ 10 files changed, 20 insertions(+), 62 deletions(-) delete mode 100755 debian/patches/ocaml309.dpatch delete mode 100755 debian/patches/text_view_typing_error.dpatch diff --git a/debian/changelog b/debian/changelog index bf1a0b67..604ef988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -coq (8.0pl2-5) UNRELEASED; urgency=low +coq (8.0pl3-1) unstable; urgency=low + * New upstream release. * Removed unnecessary dependency on liblablgtk2-ocaml for coqide. + * Removed ocaml309.dpatch and text_view_typing_error.dpatch, integrated + upstream. + * Removing rpath from coqide binaries. - -- Samuel Mimram Wed, 4 Jan 2006 20:15:52 +0100 + -- Samuel Mimram Thu, 19 Jan 2006 22:22:39 +0100 coq (8.0pl2-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 1474a3f9..9ec22d2f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Ralf Treinen , Sven Luther , Remi Vanicat , Stefano Zacchiroli , Samuel Mimram Standards-Version: 3.6.2 -Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.09.0), ocaml-best-compilers, liblablgtk2-ocaml-dev (>= 2.4.0) +Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.09.0), ocaml-best-compilers, liblablgtk2-ocaml-dev (>= 2.4.0), chrpath Package: coq Architecture: any diff --git a/debian/coq.install b/debian/coq.install index 155e13af..d1182ab6 100644 --- a/debian/coq.install +++ b/debian/coq.install @@ -9,6 +9,7 @@ usr/bin/coqtop* usr/bin/coqwc usr/bin/gallina usr/share/emacs/site-lisp/coq +usr/share/emacs/site-lisp/coqdoc.sty usr/share/man/man1/c* usr/share/man/man1/gallina.1 usr/share/texmf/tex/latex/misc/* diff --git a/debian/coqide.dirs b/debian/coqide.dirs index 3afbe849..bf32ae9c 100644 --- a/debian/coqide.dirs +++ b/debian/coqide.dirs @@ -2,3 +2,4 @@ usr/lib/coq/ide usr/share/doc/coqide usr/share/applications usr/share/man/man1 +usr/share/pixmaps diff --git a/debian/coqide.install b/debian/coqide.install index f214e01c..7df75581 100644 --- a/debian/coqide.install +++ b/debian/coqide.install @@ -1,4 +1,5 @@ usr/bin/coqide* -usr/lib/coq/ide/coq.png +usr/lib/coq/ide/coq.ico +usr/lib/coq/ide/coq2.ico usr/lib/coq/ide/utf8.vo usr/lib/coq/ide/.coqide-gtk2rc diff --git a/debian/coqide.menu b/debian/coqide.menu index 00dc4139..0fb1935a 100644 --- a/debian/coqide.menu +++ b/debian/coqide.menu @@ -1,4 +1,4 @@ ?package(coqide):command="/usr/bin/coqide" \ - icon="/usr/share/pixmaps/coq.xpm" \ + icon="/usr/share/pixmaps/coqide.xpm" \ needs="X11" \ section="Apps/Math" title="CoqIde" diff --git a/debian/patches/00list b/debian/patches/00list index ff826cb0..e69de29b 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +0,0 @@ -ocaml309 -text_view_typing_error diff --git a/debian/patches/ocaml309.dpatch b/debian/patches/ocaml309.dpatch deleted file mode 100755 index e116bf0e..00000000 --- a/debian/patches/ocaml309.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ocaml309.dpatch by Samuel Mimram -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Correct a compilation issue with OCaml 3.09. - -@DPATCH@ -diff -urNad coq-8.0pl2~/Makefile coq-8.0pl2/Makefile ---- coq-8.0pl2~/Makefile 2005-01-21 18:15:12.000000000 +0100 -+++ coq-8.0pl2/Makefile 2005-11-21 19:51:38.000000000 +0100 -@@ -1453,11 +1453,11 @@ - - .ml4.cmx: - $(SHOW)'OCAMLOPT4 $<' -- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $< -+ $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -loc loc -impl" -c -impl $< - - .ml4.cmo: - $(SHOW)'OCAMLC4 $<' -- $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $< -+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -loc loc -impl" -c -impl $< - - #.v.vo: - # $(BOOTCOQTOP) -compile $* diff --git a/debian/patches/text_view_typing_error.dpatch b/debian/patches/text_view_typing_error.dpatch deleted file mode 100755 index cc37d08a..00000000 --- a/debian/patches/text_view_typing_error.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## text_view_typing_error.dpatch by Samuel Mimram -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Avoid a typing error with recent versions of lablgtk2. - -@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 diff --git a/debian/rules b/debian/rules index 6d7ec28b..b4498d12 100755 --- a/debian/rules +++ b/debian/rules @@ -74,7 +74,13 @@ install: build echo "Stripping: $$i"; \ strip -R .note -R .comment $$i; \ done + -for i in $(COQPREF)/usr/bin/coqide.*; do \ + echo "Rpath for `chrpath $$i`"; \ + echo "Removing rpath: $$i"; \ + chrpath -d $$i; \ + done cp debian/coq.xpm debian/coq/usr/share/pixmaps/coq.xpm + cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm cp debian/coqide.desktop debian/coqide/usr/share/applications cp ide/index_urls.txt debian/coqide/usr/lib/coq/ide/index_urls.txt @@ -90,6 +96,8 @@ install: build cp debian/coqmktop.1 debian/coq/usr/share/man/man1/coqmktop.1 cp debian/coqtop.1 debian/coq/usr/share/man/man1/coqtop.1 + chmod -x debian/tmp/usr/lib/coq/ide/coq2.ico + # These are installed as docs rm -f $(COQPREF)/usr/lib/coq/ide/utf8.v $(COQPREF)/usr/lib/coq/ide/FAQ -- cgit v1.2.3