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.7.3ubuntu3) yakkety; urgency=medium * No-change rebuild for ocaml ABIs. -- Matthias Klose <doko@ubuntu.com> Fri, 02 Sep 2016 12:12:48 +0000 ben (0.7.3ubuntu2) xenial; urgency=medium * Rebuild for new OCaml ABIs. -- Matthias Klose <doko@ubuntu.com> Fri, 12 Feb 2016 12:07:15 +0000 ben (0.7.3ubuntu1) xenial; 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. * Fixes FTBFS (LP: #1515019) -- Iain Lane <iain@orangesquash.org.uk> Wed, 11 Nov 2015 19:08:23 +0000

Modifications :
  1. Download patch media/revamp.css

    --- 0.7.3/media/revamp.css 2015-07-17 07:48:50.000000000 +0000 +++ 0.7.3ubuntu3/media/revamp.css 2015-10-18 22:11:03.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; } Binary files 0.7.3/media/ubuntu.png and 0.7.3ubuntu3/media/ubuntu.png differ
  2. Download patch debian/control

    --- 0.7.3/debian/control 2015-10-18 11:54:03.000000000 +0000 +++ 0.7.3ubuntu3/debian/control 2015-10-18 22:11:03.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> @@ -29,8 +30,10 @@ Build-Depends: Standards-Version: 3.9.5 Section: devel Homepage: http://ben.debian.net -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ben.git -Vcs-Git: git://anonscm.debian.org/collab-maint/ben.git +XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ben.git +XS-Debian-Vcs-Git: git://anonscm.debian.org/collab-maint/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 Architecture: any
  3. Download patch frontends/ben_monitor.ml

    --- 0.7.3/frontends/ben_monitor.ml 2015-10-18 13:07:27.000000000 +0000 +++ 0.7.3ubuntu3/frontends/ben_monitor.ml 2015-10-18 22:11:03.000000000 +0000 @@ -302,7 +302,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" ] module SS = Set.Make(String)
  4. Download patch lib/query.ml

    --- 0.7.3/lib/query.ml 2015-07-17 07:48:50.000000000 +0000 +++ 0.7.3ubuntu3/lib/query.ml 2015-10-18 22:11:03.000000000 +0000 @@ -73,7 +73,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.7.3/frontends/ben_tracker.ml 2015-10-18 13:09:18.000000000 +0000 +++ 0.7.3ubuntu3/frontends/ben_tracker.ml 2015-11-11 17:42:53.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_frontend @@ -72,6 +73,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) ) @@ -139,7 +142,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 @@ -150,7 +153,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.7.3/templates/ubuntu.ml 1970-01-01 00:00:00.000000000 +0000 +++ 0.7.3ubuntu3/templates/ubuntu.ml 2015-11-11 17:57:21.000000000 +0000 @@ -0,0 +1,47 @@ +open Printf +open Html5.M + +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 + (Html5.M.title (pcdata title)) + headers + ) + (Html5.M.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: ocaml

ocaml (4.02.3-6ubuntu2) yakkety; urgency=medium * Build with -fPIC on amd64. -- Matthias Klose <doko@ubuntu.com> Mon, 25 Apr 2016 16:26:32 +0200 ocaml (4.02.3-6ubuntu1) yakkety; urgency=medium * Merge with Debian; remaining changes: - Pass --hash-style=both --as-needed --build-id to the linker. -- Matthias Klose <doko@ubuntu.com> Mon, 25 Apr 2016 16:04:30 +0200

Modifications :
  1. Download patch .pc/pie-on-amd64.diff/configure
  2. Download patch .pc/linker-flags.patch/configure
  3. Download patch debian/patches/linker-flags.patch

    --- 4.02.3-6/debian/patches/linker-flags.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.02.3-6ubuntu2/debian/patches/linker-flags.patch 2016-04-25 14:06:51.000000000 +0000 @@ -0,0 +1,25 @@ +Index: ocaml-3.12.1/configure +=================================================================== +--- ocaml-3.12.1.orig/configure 2011-11-18 17:45:15.000000000 +0000 ++++ ocaml-3.12.1/configure 2011-11-18 17:54:51.104603036 +0000 +@@ -285,7 +285,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";; + cc,mips-*-irix6*) + # Add -n32 flag to ensure compatibility with native-code compiler + bytecccompopts="-n32" +@@ -740,7 +742,8 @@ + nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; + *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" + 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";; + *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; + amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; + amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
  4. Download patch debian/control

    --- 4.02.3-6/debian/control 2016-02-15 10:09:57.000000000 +0000 +++ 4.02.3-6ubuntu2/debian/control 2016-04-25 14:06:51.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>,
  5. Download patch debian/control.in

    --- 4.02.3-6/debian/control.in 2016-02-15 10:09:57.000000000 +0000 +++ 4.02.3-6ubuntu2/debian/control.in 2016-04-25 14:06:51.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>,
  6. Download patch .pc/applied-patches

    --- 4.02.3-6/.pc/applied-patches 2016-04-26 03:08:14.738459635 +0000 +++ 4.02.3-6ubuntu2/.pc/applied-patches 2016-04-26 03:08:15.290475121 +0000 @@ -9,3 +9,5 @@ 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch 0010-Add-a-.file-directive-to-generated-.s-files.patch 0011-Compatibility-with-x32-architecture.patch +linker-flags.patch +pie-on-amd64.diff
  7. Download patch configure

    --- 4.02.3-6/configure 2016-04-26 03:08:14.000000000 +0000 +++ 4.02.3-6ubuntu2/configure 2016-04-26 03:08:15.000000000 +0000 @@ -366,7 +366,9 @@ case "$bytecc,$target" in 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";; cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" @@ -901,7 +903,8 @@ case "$arch,$nativecc,$system,$target" i nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" 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";; *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";; @@ -1010,6 +1013,10 @@ else echo "SHARPBANGSCRIPTS=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"
  8. Download patch debian/patches/pie-on-amd64.diff

    --- 4.02.3-6/debian/patches/pie-on-amd64.diff 1970-01-01 00:00:00.000000000 +0000 +++ 4.02.3-6ubuntu2/debian/patches/pie-on-amd64.diff 2016-04-25 14:30:01.000000000 +0000 @@ -0,0 +1,15 @@ +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -1013,6 +1013,10 @@ else + echo "SHARPBANGSCRIPTS=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"
  9. Download patch debian/patches/series

    --- 4.02.3-6/debian/patches/series 2016-02-16 10:33:07.000000000 +0000 +++ 4.02.3-6ubuntu2/debian/patches/series 2016-04-25 14:28:56.000000000 +0000 @@ -9,3 +9,5 @@ 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch 0010-Add-a-.file-directive-to-generated-.s-files.patch 0011-Compatibility-with-x32-architecture.patch +linker-flags.patch +pie-on-amd64.diff

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

Source: slurm-llnl

slurm-llnl (16.05.2-1ubuntu2) yakkety; urgency=medium * No-change rebuild for readline soname change. -- Matthias Klose <doko@ubuntu.com> Sat, 17 Sep 2016 12:10:49 +0000 slurm-llnl (16.05.2-1ubuntu1) yakkety; urgency=medium * Merge with Debian: remaining changes: - Don't manually modify the -dbgsym package. -- Matthias Klose <doko@ubuntu.com> Wed, 24 Aug 2016 10:37:20 +0200

Modifications :
  1. Download patch debian/rules

    --- 16.05.2-1/debian/rules 2016-07-15 14:32:11.000000000 +0000 +++ 16.05.2-1ubuntu2/debian/rules 2016-08-24 08:37:20.000000000 +0000 @@ -102,7 +102,8 @@ override_dh_strip: dh_strip -plibslurmdb-dev dh_strip -plibslurm-dev dh_strip -pslurm-wlm-basic-plugins-dev - strip --strip-debug --remove-section=.comment \ + : # doesn't work on Launchpad + : strip --strip-debug --remove-section=.comment \ --remove-section=.note debian/slurm-wlm-basic-plugins-dev/usr/lib/*/slurm/*.a override_dh_auto_test:

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

Source: why

why (2.34-4ubuntu5) yakkety; urgency=medium * No-change rebuild against frama-c 20151002+magnesium+dfsg-1build2 -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 10 Jul 2016 13:41:00 -0700 why (2.34-4ubuntu4) xenial; urgency=medium * Disable the why+coq autopkg test. -- Matthias Klose <doko@ubuntu.com> Tue, 23 Feb 2016 16:34:34 +0100 why (2.34-4ubuntu3) xenial; urgency=medium * Drop build dependency on libfloat-coq, not buildable with the the current coq. * why still fails to build, so drop the the libwhy-coq binary and coq build dependency. -- Matthias Klose <doko@ubuntu.com> Tue, 23 Feb 2016 15:36:48 +0100 why (2.34-4ubuntu2) xenial; urgency=medium * Rebuild for new OCaml ABIs. -- Matthias Klose <doko@ubuntu.com> Fri, 12 Feb 2016 12:07:26 +0000 why (2.34-4ubuntu1) xenial; urgency=medium * Rebase on Debian, remaining change: + debian/tests/control: Disable frama-c+jessie+alt-ergo test, since we don't have a jessie plugin currently (until we get 'why3') -- Iain Lane <iain@orangesquash.org.uk> Wed, 04 Nov 2015 12:12:10 +0000

Modifications :
  1. Download patch debian/tests/control

    --- 2.34-4/debian/tests/control 2015-10-16 22:19:11.000000000 +0000 +++ 2.34-4ubuntu5/debian/tests/control 2016-02-23 15:34:32.000000000 +0000 @@ -4,8 +4,8 @@ Depends: why, alt-ergo Tests: why+cvc3 Depends: why, cvc3 -Tests: why+coq -Depends: why, libwhy-coq, coq +#Tests: why+coq +#Depends: why, libwhy-coq, coq -Tests: frama-c+jessie+alt-ergo -Depends: why, frama-c-base, alt-ergo +#Tests: frama-c+jessie+alt-ergo +#Depends: why, frama-c-base, alt-ergo
  2. Download patch debian/rules

    --- 2.34-4/debian/rules 2015-10-16 22:19:11.000000000 +0000 +++ 2.34-4ubuntu5/debian/rules 2016-02-23 15:10:37.000000000 +0000 @@ -4,7 +4,6 @@ export DH_VERBOSE=1 include /usr/share/ocaml/ocamlvars.mk -include /usr/share/coq/coqvars.mk WHYDIR = $(CURDIR)/debian/why FRAMADIR = $(WHYDIR)/$(shell frama-c -print-plugin-path) @@ -12,6 +11,10 @@ FRAMAVER = $(shell dpkg-query -W -f='$$ VERSION = $(shell cat Version | grep ^VERSION | cut -d= -f 2) export OCAMLINIT_SED += -e 's/@VERSION@/$(VERSION)/g' +override_dh_auto_test: + : # requires coq + true + override_dh_auto_configure: autoconf ./configure \ @@ -41,7 +44,6 @@ override_dh_auto_install: -$(RM) -rf $(WHYDIR)/usr/share/jessie/ #Jessie.cma is installed, no need for this extra file -$(RM) -f $(FRAMADIR)/Jessie.cmo - echo 'F:CoqABI=$(COQ_ABI)' >> debian/libwhy-coq.substvars echo 'F:FramaCVersion=$(FRAMAVER)' >> debian/why.substvars override_dh_compress:
  3. Download patch debian/control

    --- 2.34-4/debian/control 2015-10-16 22:19:11.000000000 +0000 +++ 2.34-4ubuntu5/debian/control 2016-07-10 20:41:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: why Section: math 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>, Mehdi Dogguy <mehdi@debian.org>, Ralf Treinen <treinen@debian.org> @@ -14,8 +15,6 @@ Build-Depends: ocaml-best-compilers, camlp4, liblablgtk2-ocaml-dev (>= 2.12.0-3~), - coq (>= 8.3~), - libfloat-coq, libocamlgraph-ocaml-dev (>= 1.4~), frama-c-base (>= 20140301+neon+dfsg), libapron-ocaml-dev (>= 0.9.10-4~), @@ -48,7 +47,6 @@ Package: why-examples Architecture: all Depends: ${misc:Depends}, - libwhy-coq, why Section: doc Description: Examples of programs certified with Why @@ -60,16 +58,3 @@ Description: Examples of programs certif decision procedures Simplify, Alt-Ergo, Yices, CVC Lite and haRVey. . This package contains examples of programs verified using Why. - -Package: libwhy-coq -Architecture: all -Depends: - ${misc:Depends}, - coq-${F:CoqABI} -Replaces: - why (<< 2.18.dfsg-1) -Section: libdevel -Description: Why library for Coq - This package contains all useful logical definitions, lemmas with their - proofs and axioms used by Why. Users may need this package when proving - some proof obligations in Coq.
  1. ben
  2. ocaml
  3. slurm-llnl
  4. why