Synchronize generated files

diff --git a/debian/MANIFEST b/debian/MANIFEST
index 7198450aae10ef0a38cb3a72876c61f58f345ef5..17d3426266e533df3857547698a07fb64a18f697 100644 (file)
--- a/debian/MANIFEST
+++ b/debian/MANIFEST
@@ -1,3 +1,4 @@
+debian/.gitattributes
 debian/MANIFEST
 debian/OCaml_for_Debian
 debian/README.source
@@ -8,49 +9,29 @@ debian/compat
 debian/control
 debian/control.in
 debian/copyright
+debian/dispatch.ml
 debian/gbp.conf
-debian/gen_modules.pl
 debian/ld.conf.in
 debian/man/ocamldumpobj.1
 debian/man/ocamlmklib.1
 debian/man/ocamlobjinfo.1
 debian/native-archs
-debian/ocaml-base-nox.dirs.in
 debian/ocaml-base-nox.docs
-debian/ocaml-base-nox.install.in
 debian/ocaml-base-nox.postinst.in
 debian/ocaml-base-nox.prerm.in
-debian/ocaml-base.dirs.in
-debian/ocaml-base.install.in
-debian/ocaml-compiler-libs.install.in
-debian/ocaml-interp.install.in
-debian/ocaml-interp.menu
-debian/ocaml-mode.README.Debian
-debian/ocaml-mode.dirs
-debian/ocaml-mode.emacsen-compat
-debian/ocaml-mode.emacsen-install
-debian/ocaml-mode.emacsen-remove
-debian/ocaml-mode.emacsen-startup
-debian/ocaml-native-compilers.dirs
 debian/ocaml-native-compilers.files
-debian/ocaml-native-compilers.install
-debian/ocaml-native-compilers.links
-debian/ocaml-nox.dirs.in
-debian/ocaml-nox.install.in
 debian/ocaml-nox.lintian-overrides.in
 debian/ocaml-nox.manpages.in
 debian/ocaml-nox.postinst.in
 debian/ocaml-nox.postrm
 debian/ocaml-nox.preinst
-debian/ocaml-source.dirs.in
 debian/ocaml-source.exclude
 debian/ocaml-source.install.in
-debian/ocaml.dirs.in
-debian/ocaml.examples
-debian/ocaml.install.in
+debian/ocaml.desktop
 debian/ocaml.xpm
 debian/ocamlfind/ocaml-native-compilers.conf
 debian/ocamlinit.mk
+debian/ocamlvars.mk
 debian/rules
 debian/source/format
 debian/watch

diff --git a/debian/control.in b/debian/control.in
index fc3c50b8561015071a4870449968e5e580839af4..88803001550f15bd60b8b375075eefc18a6bb197 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,10 +19,49 @@ Build-Depends:
  libx11-dev,
  zlib1g-dev,
  dh-ocaml (>= 1.0.0~)
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/
-Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/
-Homepage: http://caml.inria.fr/
+Standards-Version: 4.0.0
+Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml.git
+Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml
+Homepage: https://ocaml.org/
+
+# This needs to stay at the top - we symlink docs to the copy in this package,
+# and dh_installdocs installs README.Debian etc into the first package listed.
+Package: ocaml-base-nox
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Provides:
+ ${ocaml:Provides}
+Replaces: ocaml-interp (<< 3.11.1-3)
+Breaks: ocaml-interp (<< 3.11.1-3)
+Description: Runtime system for OCaml bytecode executables (no X)
+ Objective Caml (OCaml) is an implementation of the ML language, based on
+ the Caml Light dialect extended with a complete class-based object system
+ and a powerful module system in the style of Standard ML.
+ .
+ This package contains only the runtime system needed to run bytecode
+ executables that do not use the graphics library. The 'ocaml' package
+ contains the full development suite of Objective Caml.
+
+Package: ocaml-base
+Architecture: any
+Depends:
+ ocaml-base-nox,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${ocaml:Depends}
+Provides:
+ ${ocaml:Provides}
+Description: Runtime system for OCaml bytecode executables
+ Objective Caml (OCaml) is an implementation of the ML language, based on
+ the Caml Light dialect extended with a complete class-based object system
+ and a powerful module system in the style of Standard ML.
+ .
+ This package contains only the runtime system needed to run bytecode
+ executables. The 'ocaml' package contains the full development suite of
+ Objective Caml.  You may wish to install the 'ocaml-base-nox' package if
+ you do not require any graphical capabilities for your runtime.
 
 Package: ocaml-nox
 Architecture: any
@@ -42,9 +81,9 @@ Provides:
  libnums-ocaml-dev
 Suggests:
  ocaml-doc,
- tuareg-mode | ocaml-mode
+ tuareg-mode
 Recommends:
- camlp4,
+ ocaml-man,
  file
 Replaces: ocaml-interp (<< 3.11.1-3), ocaml-native-compilers (<< 4.04.0-1)
 Breaks:
@@ -108,43 +147,6 @@ Description: ML language implementation with a class-based object system
  This package contains everything needed to develop OCaml applications,
  including the graphics libraries.
 
-Package: ocaml-base-nox
-Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
-Provides:
- ${ocaml:Provides}
-Replaces: ocaml-interp (<< 3.11.1-3)
-Breaks: ocaml-interp (<< 3.11.1-3)
-Description: Runtime system for OCaml bytecode executables (no X)
- Objective Caml (OCaml) is an implementation of the ML language, based on
- the Caml Light dialect extended with a complete class-based object system
- and a powerful module system in the style of Standard ML.
- .
- This package contains only the runtime system needed to run bytecode
- executables that do not use the graphics library. The 'ocaml' package
- contains the full development suite of Objective Caml.
-
-Package: ocaml-base
-Architecture: any
-Depends:
- ocaml-base-nox,
- ${shlibs:Depends},
- ${misc:Depends},
- ${ocaml:Depends}
-Provides:
- ${ocaml:Provides}
-Description: Runtime system for OCaml bytecode executables
- Objective Caml (OCaml) is an implementation of the ML language, based on
- the Caml Light dialect extended with a complete class-based object system
- and a powerful module system in the style of Standard ML.
- .
- This package contains only the runtime system needed to run bytecode
- executables. The 'ocaml' package contains the full development suite of
- Objective Caml.  You may wish to install the 'ocaml-base-nox' package if
- you do not require any graphical capabilities for your runtime.
-
 Package: ocaml-source
 Architecture: all
 Depends: ${misc:Depends}
@@ -182,6 +184,8 @@ Depends:
  ocaml-nox-${F:OCamlABI}
 Provides:
  ocaml-compiler-libs-${F:OCamlABI}
+Recommends:
+ ocaml-man
 Replaces: ocaml-base-nox (<< 4)
 Breaks: ocaml-base-nox (<< 4)
 Description: OCaml interpreter and standard libraries
@@ -193,23 +197,22 @@ Description: OCaml interpreter and standard libraries
  compilers.  They are not needed for normal OCaml development, but may
  be helpful in the development of certain applications.
 
-Package: ocaml-mode
+Package: ocaml-man
 Architecture: all
 Depends:
- emacs | emacsen, emacsen-common (>= 2.0.8),
  ${misc:Depends}
-Suggests: ocaml
-Description: major mode for editing Objective Caml in Emacs
+Breaks:
+ ocaml (<< 4.08),
+ ocaml-nox (<< 4.08),
+ ocaml-compiler-libs (<< 4.08)
+Replaces:
+ ocaml (<< 4.08),
+ ocaml-nox (<< 4.08),
+ ocaml-compiler-libs (<< 4.08)
+Description: OCaml interpreter and standard libraries (lib manpages)
  Objective (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
  and a powerful module system in the style of Standard ML.
  .
- This package provides support for editing both Objective Caml and
- Caml Light programs with Emacs and XEmacs.
- .
- Caml-mode supports:
-  - indentation
-  - compilation and error retrieving
-  - interaction with the toplevel
-  - font-lock
-  - imenu
+ This package contains ocamldoc-generated documentation about libraries
+ provided by OCaml.