[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-2-25-g14dc709

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 277eee0a26f50107a302957a9dff7119afae84c2
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Feb 1 07:28:06 2009 +0100

    Rename binary package coq-libs -> coq-theories
    
    Rationale: the name coq-libs is rather confusing for the contents of
    this package. There is no doubt on the contents of the package with
    coq-theories.

diff --git a/debian/control b/debian/control
index 5df9fe8..b3dadb5 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,12 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq.git
 
 Package: coq
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox-${F:OCamlABI}, coq-libs (= ${source:Version}), emacsen-common
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ocaml-base-nox-${F:OCamlABI},
+ coq-theories (= ${source:Version}),
+ emacsen-common
 Recommends: coqide | proofgeneral-coq
 Suggests:
  ocaml-nox,
@@ -63,11 +68,12 @@ Description: proof assistant for higher-order logic (gtk interface)
  This package provides CoqIde, a graphical user interface for
  developing proofs.
 
-Package: coq-libs
+Package: coq-theories
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: coq (>= 8.0)
-Conflicts: coq (<< 8.0), coq-doc (<= 8.0pl1.0-2)
+Conflicts: coq-doc (<= 8.0pl1.0-2), coq-libs
+Replaces: coq-libs
 Description: proof assistant for higher-order logic (theories)
  Coq is a proof assistant for higher-order logic, which allows the
  development of computer programs consistent with their formal
diff --git a/debian/coq-libs.dirs b/debian/coq-libs.dirs
deleted file mode 100644
index aadcf27..0000000
--- a/debian/coq-libs.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/coq-libs
-usr/share/doc/coq
diff --git a/debian/coq-libs.links b/debian/coq-libs.links
deleted file mode 100644
index 9a521ba..0000000
--- a/debian/coq-libs.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/coq-libs/html /usr/share/doc/coq/stdlib-html
diff --git a/debian/coq-theories.dirs b/debian/coq-theories.dirs
new file mode 100644
index 0000000..633cedc
--- /dev/null
+++ b/debian/coq-theories.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/coq-theories
+usr/share/doc/coq
diff --git a/debian/coq-libs.doc-base b/debian/coq-theories.doc-base
similarity index 80%
rename from debian/coq-libs.doc-base
rename to debian/coq-theories.doc-base
index 8a727b1..ab3904e 100644
--- a/debian/coq-libs.doc-base
+++ b/debian/coq-theories.doc-base
@@ -5,5 +5,5 @@ Abstract: Standard Library documentation of version 8.0 of the Coq proof assista
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/coq-libs/html/index.html
-Files: /usr/share/doc/coq-libs/html/*.html
+Index: /usr/share/doc/coq-theories/html/index.html
+Files: /usr/share/doc/coq-theories/html/*.html
diff --git a/debian/coq-libs.install.in b/debian/coq-theories.install.in
similarity index 96%
rename from debian/coq-libs.install.in
rename to debian/coq-theories.install.in
index ebc0339..482e5c6 100644
--- a/debian/coq-libs.install.in
+++ b/debian/coq-theories.install.in
@@ -1,2 +1 @@
 # *.vo files will be added here
-
diff --git a/debian/coq-theories.links b/debian/coq-theories.links
new file mode 100644
index 0000000..cd795b0
--- /dev/null
+++ b/debian/coq-theories.links
@@ -0,0 +1 @@
+/usr/share/doc/coq-theories/html /usr/share/doc/coq/stdlib-html
diff --git a/debian/rules b/debian/rules
index 3de9b10..4e502a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,12 +73,12 @@ install-stamp: build-stamp
 	  -regex '.*\.(cm[aoxi]|cmxa|[ao])$$' \
 	  >> debian/libcoq-ocaml-dev.install
 	find debian/tmp -name '*.vo' -printf '%P\n' \
-	  >> debian/coq-libs.install
+	  >> debian/coq-theories.install
 	dh_install --list-missing
 	cp debian/coq.xpm debian/coq/usr/share/pixmaps
 	cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
 	cp debian/coqide.desktop debian/coqide/usr/share/applications
-	cp -r doc/stdlib/html debian/coq-libs/usr/share/doc/coq-libs/
+	cp -r doc/stdlib/html debian/coq-theories/usr/share/doc/coq-theories/
 	dh install --after dh_install
 	touch $@
 

-- 
coq packaging