Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: ben

ben (0.9.1ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - Show Ubuntu logo. - Allow configs to request the Packages/Sources files are not redownloaded (so that we can download once and for all at the start). - Add an Ubuntu template. - Tolerate templates with buildds or critical_bugs entries that return None. -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 28 Sep 2020 10:32:52 +0200

Modifications :
  1. Download patch media/revamp.css

    --- 0.9.1/media/revamp.css 2020-09-27 09:40:02.000000000 +0000 +++ 0.9.1ubuntu1/media/revamp.css 2020-09-27 15:16:02.000000000 +0000 @@ -16,7 +16,7 @@ body { } body.debian { - background: #fff url('debian.png') no-repeat 10px 7px; + background: #fff url('ubuntu.png') no-repeat 10px 7px; } a:link { color: #0755d7; text-decoration: underline; }
  2. Download patch debian/control

    --- 0.9.1/debian/control 2020-09-27 09:40:02.000000000 +0000 +++ 0.9.1ubuntu1/debian/control 2020-09-27 15:16:01.000000000 +0000 @@ -1,6 +1,7 @@ Source: ben Priority: optional -Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> Uploaders: St├ęphane Glondu <glondu@debian.org>, Mehdi Dogguy <mehdi@debian.org> @@ -30,8 +31,8 @@ Standards-Version: 4.5.0 Rules-Requires-Root: no Section: devel Homepage: https://ben.debian.net -Vcs-Browser: https://salsa.debian.org/debian/ben -Vcs-Git: https://salsa.debian.org/debian/ben.git +Vcs-Browser: https://code.launchpad.net/~ubuntu-transition-trackers/ubuntu-transition-tracker/ben +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-transition-trackers/ubuntu-transition-tracker/ben Package: libben-ocaml-dev Section: ocaml
  3. Download patch frontends/ben_monitor.ml

    --- 0.9.1/frontends/ben_monitor.ml 2020-09-27 09:40:02.000000000 +0000 +++ 0.9.1ubuntu1/frontends/ben_monitor.ml 2020-09-27 15:16:01.000000000 +0000 @@ -26,7 +26,7 @@ open Benl_compat.Html let use_colors = ref false let output_file = ref None let input_source = ref Benl_types.NoSource -let baseurl = ref "file:///.." +let baseurl = ref "https://people.canonical.com/~ubuntu-archive/transitions/" type output_format = Text | Xhtml | Levels | Json let output_format = ref Levels @@ -309,7 +309,9 @@ let generated_on_text () = [ pcdata "Page generated by "; a_link ben_webpage "Ben "; pcdata Benl_version.version; - pcdata (Printf.sprintf " on %s" (Benl_core.get_rfc2822_date ())) + pcdata (Printf.sprintf " on %s" (Benl_core.get_rfc2822_date ())); + pcdata "; bzr branch "; + a_link "https://code.launchpad.net/+branch/ubuntu-transition-tracker" "lp:ubuntu-transition-tracker" ] let overrall_state l =
  4. Download patch lib/query.ml

    --- 0.9.1/lib/query.ml 2020-09-27 09:40:02.000000000 +0000 +++ 0.9.1ubuntu1/lib/query.ml 2020-09-27 15:16:01.000000000 +0000 @@ -78,7 +78,7 @@ let rec to_string_b ?(escape = true) las | EMatch (f, ERegexp r) -> sprintf ".%s ~ %s" f (string_of_regexp r) | ENot e -> - sprintf "!%s" (to_string_b "!" e) + sprintf "!%s" (to_string_b last_op e) | Etrue -> sprintf "true" | Efalse -> sprintf "false" | EAnd (e1, e2) ->
  5. Download patch .gitignore

    --- 0.9.1/.gitignore 2020-09-27 09:40:02.000000000 +0000 +++ 0.9.1ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -_build -ben -*~ -modules.png -doc/ben.1 -doc/refman.html
  6. Download patch frontends/ben_tracker.ml

    --- 0.9.1/frontends/ben_tracker.ml 2020-09-27 09:40:02.000000000 +0000 +++ 0.9.1ubuntu1/frontends/ben_tracker.ml 2020-09-28 08:32:51.000000000 +0000 @@ -34,6 +34,7 @@ let lock = ref "ben.lock" let clean = ref true let tconfig = ref None let output_formats = ref [Ben_monitor.Xhtml] +let redownload = ref true open Benl_types open Benl_modules @@ -85,6 +86,8 @@ let read_global_config () = output_formats := to_string_l "output-formats" formats |> List.map Ben_monitor.format_of_string + | "redownload", Efalse -> + redownload := false | item, _ -> warn (Unknown_configuration_item item) ) @@ -150,7 +153,7 @@ let is_packages_file name = let clear_cache () = let cached = !cache_dir in let cachef = !cache_file in - let test_cond = Or (Basename_is cachef, Custom is_packages_file) in + let test_cond = Basename_is cachef in let pkgs = find test_cond cached (fun x y -> y ::x) [] in rm ~force:Force pkgs @@ -161,7 +164,7 @@ let update_test () = let read_cache architectures = if update_test () then begin - if not !Benl_data.use_projectb then begin + if !redownload && not !Benl_data.use_projectb then begin clear_cache (); Ben_download.download_all architectures; end;
  7. Download patch templates/ubuntu.ml

    --- 0.9.1/templates/ubuntu.ml 1970-01-01 00:00:00.000000000 +0000 +++ 0.9.1ubuntu1/templates/ubuntu.ml 2020-09-28 08:32:52.000000000 +0000 @@ -0,0 +1,48 @@ +open Printf +open Tyxml.Html +open Benl_compat.Html + +let href uri = + a_href (uri_of_string uri) + +let a_link url text = + a ~a:[a_href (uri_of_string url)] [pcdata text] + +let page ~title ~subtitle ~headers ~body ~footer = + let headers = + (meta + ~a:[a_charset "utf-8"] + ()) + :: + (link ~rel:[`Stylesheet] ~href:"media/revamp.css" ()) + :: + (link ~rel:[`Stylesheet] ~href:"media/styles.css" ()) + :: + headers in + html ~a:[a_xmlns `W3_org_1999_xhtml] + (head + (Tyxml.Html.title (pcdata title)) + headers + ) + (Tyxml.Html.body ~a:[a_class ["debian"]] [ + h1 ~a:[a_id "title"] [pcdata "Ubuntu Release Management"]; + h2 ~a:[a_id "subtitle"] subtitle; + div ~a:[a_id "body"] body; + div ~a:[a_id "footer"] footer + ]) + +open Template + +let () = + Benl_templates.register_template { + name = "Ubuntu"; + page; + intro = []; + pts = (fun ~src -> sprintf "https://launchpad.net/ubuntu/+source/%s" src); + changelog = (fun ~letter ~src ~ver -> sprintf "https://changelogs.ubuntu.com/changelogs/%s/%s_%s/changelog" letter src ver); + buildd = (fun ~src ~ver -> sprintf "https://launchpad.net/ubuntu/+source/%s/%s" src ver); + buildds = (fun ~srcs -> None); + bugs = (fun ~src -> sprintf "https://bugs.launchpad.net/ubuntu/+source/%s" src); + critical_bugs = (fun ~srcs -> None); + msg_id = (fun ~mid -> sprintf "http://mid.gmane.org/%s" mid); + }

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: ibutils

ibutils (1.5.7+0.2.gbd7e502-2ubuntu3) groovy; urgency=medium * No-change rebuild against libopensm9 -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 08 May 2020 20:21:28 +0000 ibutils (1.5.7+0.2.gbd7e502-2ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. -- Matthias Klose <doko@ubuntu.com> Tue, 24 Mar 2020 15:01:51 +0100 ibutils (1.5.7+0.2.gbd7e502-2ubuntu1) disco; urgency=medium * Sync with Debian. Remaining change: - Build for all Linux architectures (Closes: #913239) * Dropped change: - Add Conflicts/Replaces on g++5 ABIs (not needed after 18.04 LTS) -- Jeremy Bicha <jbicha@ubuntu.com> Fri, 14 Dec 2018 17:58:20 -0500

Modifications :
  1. Download patch debian/control

    --- 1.5.7+0.2.gbd7e502-2/debian/control 2018-08-23 21:38:59.000000000 +0000 +++ 1.5.7+0.2.gbd7e502-2ubuntu3/debian/control 2018-12-14 22:58:20.000000000 +0000 @@ -1,7 +1,8 @@ Source: ibutils Section: net Priority: optional -Maintainer: Debian HPC Team <debian-hpc@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian HPC Team <debian-hpc@lists.debian.org> Uploaders: Mehdi Dogguy <mehdi@debian.org> Build-Depends: debhelper (>= 9), dh-autoreconf, @@ -18,7 +19,7 @@ Vcs-Browser: https://salsa.debian.org/hp Homepage: https://www.openfabrics.org/downloads/ibutils/ Package: ibutils -Architecture: amd64 i386 ia64 powerpc ppc64el +Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} Description: InfiniBand network utilities @@ -27,7 +28,7 @@ Description: InfiniBand network utilitie Package: libibdm1 Section: libs -Architecture: amd64 i386 ia64 powerpc ppc64el +Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} @@ -37,7 +38,7 @@ Description: InfiniBand network diagnost Package: libibdm-dev Section: libdevel -Architecture: amd64 i386 ia64 powerpc ppc64el +Architecture: linux-any Depends: libibdm1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: mysql-ocaml

mysql-ocaml (1.2.4-1ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - Drop references to removed features when building against MySQL >= 8.0 to fix FTBFS. - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 24 Aug 2020 10:49:52 +0200

Modifications :
  1. Download patch debian/patches/mysql-8.0

    --- 1.2.4-1/debian/patches/mysql-8.0 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.4-1ubuntu1/debian/patches/mysql-8.0 2019-07-16 16:45:45.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Drop support for options removed in MySQL 8.0 + These are no longer available in MySQL 8.0. There is already an "unknown + option" default case, so it should be safe security-wise: anything still + requesting these options will correctly fail. +Author: Robie Basak <robie.basak@canonical.com> +Origin: vendor +Forwarded: no +X-Not-Forwarded-Reason: work still in progress +Last-Update: 2018-07-16 + +--- a/mysql_stubs.c ++++ b/mysql_stubs.c +@@ -227,9 +227,13 @@ + { + case 0: SET_OPTION_BOOL(OPT_LOCAL_INFILE); + case 1: SET_OPTION_BOOL(OPT_RECONNECT); ++#if defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 80000 + case 2: SET_OPTION_BOOL(OPT_SSL_VERIFY_SERVER_CERT); ++#endif + case 3: SET_OPTION_BOOL(REPORT_DATA_TRUNCATION); ++#if defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 80000 + case 4: SET_OPTION_BOOL(SECURE_AUTH); ++#endif + case 5: SET_OPTION(OPT_PROTOCOL, &ml_mysql_protocol_type[Int_val(v)]); + case 6: SET_OPTION_INT(OPT_CONNECT_TIMEOUT); + case 7: SET_OPTION_INT(OPT_READ_TIMEOUT);
  2. Download patch debian/control

    --- 1.2.4-1/debian/control 2020-08-23 11:15:26.000000000 +0000 +++ 1.2.4-1ubuntu1/debian/control 2020-08-23 15:22:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: mysql-ocaml Section: ocaml Priority: optional -Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> Uploaders: Mehdi Dogguy <mehdi@debian.org> Build-Depends:
  3. Download patch debian/patches/mysq8_my_bool.patch

    --- 1.2.4-1/debian/patches/mysq8_my_bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.4-1ubuntu1/debian/patches/mysq8_my_bool.patch 2020-02-21 07:51:15.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 + (patch inspired from the one in cppdb 0.3.1+dfsg-8ubuntu2) +Author: Gianfranco Costamagna <locutusofborg@debian.org>, Andreas Hasenack <andreas@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 +Forwarded: no +Last-Update: 2020-02-21 + +--- mysql-ocaml-1.2.1.orig/mysql_stubs.c ++++ mysql-ocaml-1.2.1/mysql_stubs.c +@@ -71,6 +71,7 @@ + #define STMTval(x) (*(MYSQL_STMT**)Data_custom_val(x)) + #define ROWval(x) (*(row_t**)Data_custom_val(x)) + ++typedef bool my_bool; + static void mysqlfailwith(char *err) Noreturn; + static void mysqlfailmsg(const char *fmt, ...) Noreturn; +
  4. Download patch debian/patches/series

    --- 1.2.4-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.4-1ubuntu1/debian/patches/series 2020-02-21 07:51:00.000000000 +0000 @@ -0,0 +1,2 @@ +mysql-8.0 +mysq8_my_bool.patch

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: opam

opam (2.0.5-1ubuntu1) focal; urgency=medium * Fix FTBFS with Dune 2.0. Patch adapted from upstream. -- William Grant <wgrant@ubuntu.com> Mon, 13 Apr 2020 12:21:32 +1000

Modifications :
  1. Download patch debian/control

    --- 2.0.5-1/debian/control 2019-08-17 15:37:02.000000000 +0000 +++ 2.0.5-1ubuntu1/debian/control 2020-04-13 02:21:32.000000000 +0000 @@ -1,7 +1,8 @@ Source: opam Section: ocaml Priority: optional -Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> Uploaders: Mehdi Dogguy <mehdi@debian.org>, Nicolas Braud-Santoni <nicoo@debian.org>
  2. Download patch debian/patches/0004-support-dune-2.0.patch

    --- 2.0.5-1/debian/patches/0004-support-dune-2.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.5-1ubuntu1/debian/patches/0004-support-dune-2.0.patch 2020-04-13 02:21:30.000000000 +0000 @@ -0,0 +1,38 @@ +From: William Grant <wgrant@ubuntu.com> +Subject: Fix build with Dune 2.0 +Origin: backport, https://github.com/ocaml/opam/commit/3bd58d4 + +Index: opam-2.0.5/Makefile +=================================================================== +--- opam-2.0.5.orig/Makefile ++++ opam-2.0.5/Makefile +@@ -21,6 +21,7 @@ OPAMINSTALLER = ./opam-installer$(EXE) + ALWAYS: + @ + ++DUNE_PROMOTE_ARG := $(shell dune build --help=plain 2>/dev/null | sed -ne 's/.*\(--promote-install-files\).*/ \1/p') + DUNE_DEP = ALWAYS $(DUNE_EXE) + JBUILDER_ARGS ?= + DUNE_ARGS ?= $(JBUILDER_ARGS) +@@ -104,7 +105,7 @@ opam-%.install: $(DUNE_DEP) + $(DUNE) build $(DUNE_ARGS) -p opam-$* $@ + + opam.install: ALWAYS $(DUNE_DEP) +- $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) opam-installer.install opam.install ++ $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS)$(DUNE_PROMOTE_ARG) opam-installer.install opam.install + + opam-actual.install: opam.install man + @echo 'bin: [' > $@ +@@ -123,10 +124,10 @@ opam-actual.install: opam.install man + OPAMLIBS = core format solver repository state client + + opam-%: $(DUNE_DEP) +- $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) opam-$*.install ++ $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS)$(DUNE_PROMOTE_ARG) opam-$*.install + + opam-lib: $(DUNE_DEP) +- $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) $(patsubst %,opam-%.install,$(OPAMLIBS)) ++ $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS)$(DUNE_PROMOTE_ARG) $(patsubst %,opam-%.install,$(OPAMLIBS)) + + installlib-%: opam-installer opam-%.install + $(if $(wildcard src_ext/lib/*),\
  3. Download patch debian/patches/series

    --- 2.0.5-1/debian/patches/series 2019-08-17 15:37:02.000000000 +0000 +++ 2.0.5-1ubuntu1/debian/patches/series 2020-04-13 02:18:37.000000000 +0000 @@ -1,3 +1,4 @@ 0002-Add-a-test-target.patch 0002-opamFileTools.lint-Fix-typo-grammar-in-error-message.patch 0003-opamCommands-Fix-typo-grammar-in-check.patch +0004-support-dune-2.0.patch
  1. ben
  2. ibutils
  3. mysql-ocaml
  4. opam