[Pkg-ocaml-maint-commits] [ocaml-deriving-ocsigen] 09/11: New upstream name

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-deriving-ocsigen.

commit 29b496c0b405b42c60c023f4f94e583bed36e102
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 14 14:59:52 2014 +0200

    New upstream name
---
 debian/control                                  |  2 ++
 debian/copyright                                |  2 +-
 debian/libderiving-ocsigen-ocaml-dev.install.in | 16 +++++++---------
 debian/libderiving-ocsigen-ocaml.install.in     | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 52332ea..2076fcb 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Depends:
  ${shlibs:Depends},
  ${ocaml:Depends},
  ${misc:Depends}
+Conflicts: libderiving-ocaml, libderiving-ocaml-dev
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: deriving functions from type declarations in OCaml (devt files)
@@ -38,6 +39,7 @@ Depends:
  ${shlibs:Depends},
  ${ocaml:Depends},
  ${misc:Depends}
+Conflicts: libderiving-ocaml, libderiving-ocaml-dev
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: deriving functions from type declarations in OCaml (runtime)
diff --git a/debian/copyright b/debian/copyright
index 80f6cc8..af633d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: deriving-ocsigen
+Upstream-Name: deriving
 Upstream-Contact: The Ocsigen Team <dev at ocsigen.org>
 Source: https://github.com/ocsigen/deriving
 
diff --git a/debian/libderiving-ocsigen-ocaml-dev.install.in b/debian/libderiving-ocsigen-ocaml-dev.install.in
index a55b91d..7fe3eb5 100644
--- a/debian/libderiving-ocsigen-ocaml-dev.install.in
+++ b/debian/libderiving-ocsigen-ocaml-dev.install.in
@@ -1,9 +1,7 @@
- at OCamlStdlibDir@/deriving-ocsigen/*.cmi
- at OCamlStdlibDir@/deriving-ocsigen/*.mli
- at OCamlStdlibDir@/deriving-ocsigen/pa_deriving_tc.cma
- at OCamlStdlibDir@/deriving-ocsigen/pa_deriving.cma
-DYN: @OCamlStdlibDir@/deriving-ocsigen/pa_deriving_tc.cmxs
-DYN: @OCamlStdlibDir@/deriving-ocsigen/pa_deriving.cmxs
-OPT: @OCamlStdlibDir@/deriving-ocsigen/*.cmxa
-OPT: @OCamlStdlibDir@/deriving-ocsigen/*.a
-OPT: @OCamlStdlibDir@/deriving-ocsigen/*.cmx
+ at OCamlStdlibDir@/deriving/*.cmi
+ at OCamlStdlibDir@/deriving/*.mli
+DYN: @OCamlStdlibDir@/deriving/pa_deriving_tc.cmxs
+DYN: @OCamlStdlibDir@/deriving/pa_deriving.cmxs
+OPT: @OCamlStdlibDir@/deriving/*.cmxa
+OPT: @OCamlStdlibDir@/deriving/*.a
+OPT: @OCamlStdlibDir@/deriving/*.cmx
diff --git a/debian/libderiving-ocsigen-ocaml.install.in b/debian/libderiving-ocsigen-ocaml.install.in
index a62bb32..a2cda0a 100644
--- a/debian/libderiving-ocsigen-ocaml.install.in
+++ b/debian/libderiving-ocsigen-ocaml.install.in
@@ -1,5 +1,5 @@
- at OCamlStdlibDir@/deriving-ocsigen/META
- at OCamlStdlibDir@/deriving-ocsigen/deriving.cma
- at OCamlStdlibDir@/deriving-ocsigen/deriving_num.cma
-DYN: @OCamlStdlibDir@/deriving-ocsigen/deriving.cmxs
-DYN: @OCamlStdlibDir@/deriving-ocsigen/deriving_num.cmxs
+ at OCamlStdlibDir@/deriving/META
+ at OCamlStdlibDir@/deriving/deriving.cma
+ at OCamlStdlibDir@/deriving/deriving_num.cma
+DYN: @OCamlStdlibDir@/deriving/deriving.cmxs
+DYN: @OCamlStdlibDir@/deriving/deriving_num.cmxs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.git