diff -Nru planets-0.1.13/debian/changelog planets-0.1.13/debian/changelog --- planets-0.1.13/debian/changelog 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/changelog 2019-09-07 18:47:14.000000000 +0000 @@ -1,3 +1,10 @@ +planets (0.1.13-20) unstable; urgency=medium + + * Team upload + * Fix compilation with OCaml 4.08.0 + + -- Stéphane Glondu Sat, 07 Sep 2019 20:47:14 +0200 + planets (0.1.13-19) unstable; urgency=medium * Make package arch=any (closes: #898173) diff -Nru planets-0.1.13/debian/patches/0006-Fix-compilation-with-OCaml-4.08.0.patch planets-0.1.13/debian/patches/0006-Fix-compilation-with-OCaml-4.08.0.patch --- planets-0.1.13/debian/patches/0006-Fix-compilation-with-OCaml-4.08.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ planets-0.1.13/debian/patches/0006-Fix-compilation-with-OCaml-4.08.0.patch 2019-09-07 18:47:14.000000000 +0000 @@ -0,0 +1,21 @@ +From: Stephane Glondu +Date: Sat, 7 Sep 2019 20:43:57 +0200 +Subject: Fix compilation with OCaml 4.08.0 + +--- + options.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/options.ml b/options.ml +index d867ded..8248cbf 100644 +--- a/options.ml ++++ b/options.ml +@@ -20,7 +20,7 @@ let random_name length = + for i = 0 to length -1 do + str.[i] <- random_chr () + done; +- str ++ Bytes.to_string str + + module StringMap = AugMap.Make( + struct diff -Nru planets-0.1.13/debian/patches/buildflags planets-0.1.13/debian/patches/buildflags --- planets-0.1.13/debian/patches/buildflags 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/patches/buildflags 2019-09-07 18:47:14.000000000 +0000 @@ -1,8 +1,16 @@ -Description: Remove -custom build flag, replace -g with variable $(DEBUGFLAGS) +From: Debian OCaml Maintainers +Date: Sat, 7 Sep 2019 20:41:11 +0200 +Subject: Remove -custom build flag, replace -g with variable $(DEBUGFLAGS) ---- trunk/Makefile 2007-06-20 04:20:50.000000000 +0200 -+++ trunk.new/Makefile 2008-03-04 09:26:54.000000000 +0100 -@@ -15,7 +15,7 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0880807..2e7c022 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ INCLUDES=-I +labltk CAMLP4=-pp $(CAMLP4O) OCAMLDEP=ocamldep CAMLLIBS=unix.cma str.cma labltk.cma # libjpf.cma mylibs.cma diff -Nru planets-0.1.13/debian/patches/fix_desktop_file planets-0.1.13/debian/patches/fix_desktop_file --- planets-0.1.13/debian/patches/fix_desktop_file 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/patches/fix_desktop_file 2019-09-07 18:47:14.000000000 +0000 @@ -1,8 +1,16 @@ -Description: Fix properties in .desktop file +From: Debian OCaml Maintainers +Date: Sat, 7 Sep 2019 20:41:11 +0200 +Subject: Fix properties in .desktop file ---- trunk/planets.desktop 2007-06-20 04:20:50.000000000 +0200 -+++ trunk.new/planets.desktop 2008-03-04 09:36:58.000000000 +0100 -@@ -3,7 +3,7 @@ +--- + planets.desktop | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/planets.desktop b/planets.desktop +index ecd84b5..423582f 100644 +--- a/planets.desktop ++++ b/planets.desktop +@@ -3,7 +3,7 @@ Name=Planets Comment=A simple interactive program for playing with simulations of planetary systems Comment[da]=Et simpelt interaktivt program til at lege med simulering af planetsystemer Exec=planets diff -Nru planets-0.1.13/debian/patches/german_translation planets-0.1.13/debian/patches/german_translation --- planets-0.1.13/debian/patches/german_translation 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/patches/german_translation 2019-09-07 18:47:14.000000000 +0000 @@ -1,11 +1,22 @@ -Description: Add German translation +From: Debian OCaml Maintainers +Date: Sat, 7 Sep 2019 20:41:11 +0200 +Subject: Add German translation ---- trunk/lstrings.ml 2008-03-04 09:37:57.000000000 +0100 -+++ trunk.new/lstrings.ml 2008-03-04 09:38:05.000000000 +0100 -@@ -140,6 +140,65 @@ - " - | _ -> raise Not_found +--- + lstrings.ml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 60 insertions(+) + +diff --git a/lstrings.ml b/lstrings.ml +index 68745f5..a8f15be 100644 +--- a/lstrings.ml ++++ b/lstrings.ml +@@ -137,6 +137,65 @@ program!). + Bemærk at du kan finde en oversigt over genvejstasterne (en.) + i filen KEYBINDINGS.txt som fulgte med dette program. ++" ++ | _ -> raise Not_found ++ +let german word = match word with + | `paused -> "Angehalten" + | `tracing -> "Spurverfolgung" @@ -62,13 +73,10 @@ +Es folgt die Tastenbelegung. Eine Beschreibung der Tasten ist in der Datei +KEYBINDINGS.txt zu finden, die mit diesem Programm ausgeliefert wird. + -+" -+ | _ -> raise Not_found -+ - let maxsub string ~pos ~len = - let len = min len (String.length string - pos) in - String.sub string ~pos ~len -@@ -160,6 +219,7 @@ + " + | _ -> raise Not_found + +@@ -160,6 +219,7 @@ let get word = match maxsub ~pos:0 ~len:2 (Sys.getenv "LANG") with | "en" -> english word | "da" -> danish word diff -Nru planets-0.1.13/debian/patches/ocaml4_typing planets-0.1.13/debian/patches/ocaml4_typing --- planets-0.1.13/debian/patches/ocaml4_typing 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/patches/ocaml4_typing 2019-09-07 18:47:14.000000000 +0000 @@ -1,8 +1,14 @@ -Description: Fix compilation with OCaml 4.01.0 +From: Debian OCaml Maintainers +Date: Sat, 7 Sep 2019 20:41:11 +0200 +Subject: Fix compilation with OCaml 4.01.0 + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731218 +--- + options.ml | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/options.ml b/options.ml -index 0b5e47a..94fc28b 100644 +index 0b5e47a..d867ded 100644 --- a/options.ml +++ b/options.ml @@ -93,7 +93,7 @@ end diff -Nru planets-0.1.13/debian/patches/series planets-0.1.13/debian/patches/series --- planets-0.1.13/debian/patches/series 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/patches/series 2019-09-07 18:47:14.000000000 +0000 @@ -3,3 +3,4 @@ fix_desktop_file german_translation ocaml4_typing +0006-Fix-compilation-with-OCaml-4.08.0.patch diff -Nru planets-0.1.13/debian/patches/string_random_bodies planets-0.1.13/debian/patches/string_random_bodies --- planets-0.1.13/debian/patches/string_random_bodies 2018-05-08 19:58:18.000000000 +0000 +++ planets-0.1.13/debian/patches/string_random_bodies 2019-09-07 18:47:14.000000000 +0000 @@ -1,9 +1,18 @@ -Description: Fix crash in C locale due to un-i18n'ed string +From: Debian OCaml Maintainers +Date: Sat, 7 Sep 2019 20:41:11 +0200 +Subject: Fix crash in C locale due to un-i18n'ed string + Fixes-bug: 194402 +--- + display.ml | 2 +- + lstrings.ml | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) ---- trunk/display.ml 2007-06-20 04:20:50.000000000 +0200 -+++ trunk.new/display.ml 2008-03-04 09:31:13.000000000 +0100 -@@ -237,7 +237,7 @@ +diff --git a/display.ml b/display.ml +index fdf2fc3..1b71393 100644 +--- a/display.ml ++++ b/display.ml +@@ -237,7 +237,7 @@ let init_optionbox () = Options.add_option obox (new Options.void_entry_display @@ -12,10 +21,11 @@ Options.add_option_live obox diameter_multiplier (new Options.float_entry_option - ---- trunk/lstrings.ml 2007-06-20 04:20:50.000000000 +0200 -+++ trunk.new/lstrings.ml 2008-03-04 09:31:13.000000000 +0100 -@@ -68,6 +68,7 @@ +diff --git a/lstrings.ml b/lstrings.ml +index 00603fe..68745f5 100644 +--- a/lstrings.ml ++++ b/lstrings.ml +@@ -68,6 +68,7 @@ let english word = match word with | `dismiss -> "Dismiss" | `options -> "Options" | `at_startup -> "Display this screen at startup?"