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.8.2ubuntu1) cosmic; 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, 04 Jun 2018 12:06:19 +0200

Modifications :
  1. Download patch media/revamp.css

    --- 0.8.2/media/revamp.css 2018-04-25 19:22:42.000000000 +0000 +++ 0.8.2ubuntu1/media/revamp.css 2018-06-03 15:49:38.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.8.2/debian/control 2018-06-03 11:41:33.000000000 +0000 +++ 0.8.2ubuntu1/debian/control 2018-06-03 15:49:38.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 @@ Build-Depends: Standards-Version: 4.0.0 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.8.2/frontends/ben_monitor.ml 2018-06-03 11:41:33.000000000 +0000 +++ 0.8.2ubuntu1/frontends/ben_monitor.ml 2018-06-03 15:49:37.000000000 +0000 @@ -25,7 +25,7 @@ open Tyxml.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 @@ -281,7 +281,9 @@ let changelog t ver dir src = let generated_on_text () = [ pcdata "Page generated by "; a_link ben_webpage "Ben"; - 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.8.2/lib/query.ml 2018-06-03 11:41:33.000000000 +0000 +++ 0.8.2ubuntu1/lib/query.ml 2018-06-03 15:49:38.000000000 +0000 @@ -81,7 +81,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 frontends/ben_tracker.ml

    --- 0.8.2/frontends/ben_tracker.ml 2018-05-21 15:12:13.000000000 +0000 +++ 0.8.2ubuntu1/frontends/ben_tracker.ml 2018-06-03 15:49:37.000000000 +0000 @@ -32,6 +32,7 @@ let global_config = ref (FilePath.concat let lock = ref "ben.lock" let clean = ref true let tconfig = ref None +let redownload = ref true open Benl_types open Benl_modules @@ -79,6 +80,8 @@ let read_global_config () = Ben_monitor.baseurl := url | "template", (EString template) -> Benl_templates.load_template template; + | "redownload", Efalse -> + redownload := false | item, _ -> warn (Unknown_configuration_item item) ) @@ -144,7 +147,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 @@ -155,7 +158,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;
  6. Download patch templates/ubuntu.ml

    --- 0.8.2/templates/ubuntu.ml 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.2ubuntu1/templates/ubuntu.ml 2018-05-23 20:29:56.000000000 +0000 @@ -0,0 +1,47 @@ +open Printf +open Tyxml.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 "http://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-5ubuntu1) zesty; urgency=medium * Merge from Debian unstable. Remaining changes: - Enable building on all Linux architectures - Add Conflicts/Replaces on g++5 ABIs -- Bhavani Shankar <bhavi@ubuntu.com> Tue, 14 Mar 2017 08:28:12 +0530

Modifications :
  1. Download patch debian/control

    --- 1.5.7-5/debian/control 2017-03-12 18:37:23.000000000 +0000 +++ 1.5.7-5ubuntu1/debian/control 2017-03-14 02:58:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: ibutils Section: net Priority: extra -Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel@lists.alioth.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> Build-Depends: debhelper (>= 9), dh-autoreconf, swig, graphviz, tcl-dev (>= 8.6.0+6), tk-dev (>= 8.6.0+6), dpkg-dev (>= 1.16.0), libibumad-dev, libopensm-dev (>= 3.3.15) @@ -11,23 +12,25 @@ Vcs-Browser: http://anonscm.debian.org/g Homepage: https://www.openfabrics.org/downloads/ibutils/ Package: ibutils -Architecture: i386 ia64 amd64 powerpc ppc64el +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: InfiniBand network utilities This package contains a set of utilities useful for diagnosing and testing InfiniBand based networks. Package: libibdm1 -Architecture: i386 ia64 amd64 powerpc ppc64el +Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libibdm1v5 +Replaces: libibdm1v5 Description: InfiniBand network diagnostic library This package contains a library for building tools useful for diagnosing and testing InfiniBand based networks. Package: libibdm-dev Section: libdevel -Architecture: i386 ia64 amd64 powerpc ppc64el +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libibdm1 (= ${binary:Version}) Description: Development files for the libibdm library This package contains header files for building applications

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

Source: ocaml

ocaml (4.05.0-10ubuntu2) cosmic; urgency=medium * No-change rebuild for ncurses soname changes. -- Matthias Klose <doko@ubuntu.com> Thu, 03 May 2018 14:17:33 +0000 ocaml (4.05.0-10ubuntu1) bionic; urgency=medium * Merge with Debian unstable: - Pass --hash-style=both --as-needed --build-id to the linker. - Keep -fPIC patch. -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 20 Oct 2017 11:21:18 +0100

Modifications :
  1. Download patch debian/patches/linker-flags.patch

    --- 4.05.0-10/debian/patches/linker-flags.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.05.0-10ubuntu2/debian/patches/linker-flags.patch 2017-10-20 10:15:00.000000000 +0000 @@ -0,0 +1,23 @@ +--- a/configure ++++ b/configure +@@ -402,7 +402,9 @@ + if cc="$bytecc" sh ./hasgot -mieee; then + bytecccompopts="-mieee $bytecccompopts"; + fi +- bytecclinkopts="-Wl,--no-relax";; ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; ++ gcc,*-*-linux*) ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; + *,mips-*-irix6*) + # Turn off warning "unused library" + bytecclinkopts="-n32 -Wl,-woff,84";; +@@ -923,7 +925,8 @@ + case "$arch,$nativecc,$system,$model" in + *,*,nextstep,*) nativecclinkopts="-posix";; + *,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;; +- alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";; ++ alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; ++ *,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; + amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; + amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";; + power,gcc*,elf,ppc) partialld="ld -r -m elf32ppclinux";;
  2. Download patch debian/control

    --- 4.05.0-10/debian/control 2017-09-15 16:36:21.000000000 +0000 +++ 4.05.0-10ubuntu2/debian/control 2017-10-20 10:14:44.000000000 +0000 @@ -1,7 +1,8 @@ Source: 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: Samuel Mimram <smimram@debian.org>, Ralf Treinen <treinen@debian.org>,
  3. Download patch debian/control.in

    --- 4.05.0-10/debian/control.in 2017-09-15 16:36:21.000000000 +0000 +++ 4.05.0-10ubuntu2/debian/control.in 2017-10-20 10:14:44.000000000 +0000 @@ -1,7 +1,8 @@ Source: 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: Samuel Mimram <smimram@debian.org>, Ralf Treinen <treinen@debian.org>,
  4. Download patch debian/patches/pie-on-amd64.diff

    --- 4.05.0-10/debian/patches/pie-on-amd64.diff 1970-01-01 00:00:00.000000000 +0000 +++ 4.05.0-10ubuntu2/debian/patches/pie-on-amd64.diff 2017-10-20 10:15:00.000000000 +0000 @@ -0,0 +1,13 @@ +--- a/configure ++++ b/configure +@@ -1044,6 +1044,10 @@ + echo "HASHBANGSCRIPTS=false" >> Makefile + fi + ++case "$arch,$system" in ++ amd64,linux) nativecccompopts="$nativecccompopts -fPIC";; ++esac ++ + # Use 64-bit file offset if possible + + bytecccompopts="$bytecccompopts -D_FILE_OFFSET_BITS=64"
  5. Download patch debian/patches/series

    --- 4.05.0-10/debian/patches/series 2017-10-03 21:37:29.000000000 +0000 +++ 4.05.0-10ubuntu2/debian/patches/series 2017-10-20 10:19:41.000000000 +0000 @@ -9,3 +9,5 @@ 0011-arm64-hide-symbols-for-stricter-binutils.patch 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch 0014-Compute-a-stable-name-for-preprocessed-files.patch +linker-flags.patch +pie-on-amd64.diff
  1. ben
  2. ibutils
  3. ocaml