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.6.6ubuntu2) trusty; urgency=medium * Rebuild for ocaml-4.01. -- Matthias Klose <doko@ubuntu.com> Mon, 23 Dec 2013 22:22:47 +0000 ben (0.6.6ubuntu1) trusty; urgency=low * Resynchronise with Debian. 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. -- Colin Watson <cjwatson@ubuntu.com> Mon, 04 Nov 2013 14:41:20 +0000

Modifications :
  1. Download patch media/revamp.css

    --- 0.6.6/media/revamp.css 2013-08-18 11:23:59.000000000 +0000 +++ 0.6.6ubuntu2/media/revamp.css 2013-10-29 17:09:40.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.6.6/media/ubuntu.png and 0.6.6ubuntu2/media/ubuntu.png differ
  2. Download patch debian/control

    --- 0.6.6/debian/control 2013-08-18 11:30:45.000000000 +0000 +++ 0.6.6ubuntu2/debian/control 2013-10-29 17:10:20.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> @@ -25,8 +26,10 @@ Build-Depends: Standards-Version: 3.9.4 Section: ocaml 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.6.6/frontends/ben_monitor.ml 2013-08-18 12:39:25.000000000 +0000 +++ 0.6.6ubuntu2/frontends/ben_monitor.ml 2013-11-04 14:01:24.000000000 +0000 @@ -243,7 +243,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) @@ -490,16 +492,17 @@ let print_html_monitor template sources ) :: acc end ([], rows) (List.rev xs)) in - let buildd_link = - if names = [] - then small [ pcdata "arch:all" ] - else buildds template true (List.map escape names) in - let rc_bugs_link = rc_bugs template (List.map escape names) in - let column_arg = try [ - pcdata " ("; - buildd_link; pcdata " "; rc_bugs_link; - pcdata ")" - ] + let column_arg = try + let buildd_link = + if names = [] + then small [ pcdata "arch:all" ] + else buildds template true (List.map escape names) in + let rc_bugs_link = rc_bugs template (List.map escape names) in + [ + pcdata " ("; + buildd_link; pcdata " "; rc_bugs_link; + pcdata ")" + ] with Exit -> [] in archs_columns i
  4. Download patch lib/query.ml

    --- 0.6.6/lib/query.ml 2013-08-18 11:23:59.000000000 +0000 +++ 0.6.6ubuntu2/lib/query.ml 2013-10-29 16:13:42.000000000 +0000 @@ -39,7 +39,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.6.6/frontends/ben_tracker.ml 2013-08-18 11:23:59.000000000 +0000 +++ 0.6.6ubuntu2/frontends/ben_tracker.ml 2013-11-04 13:50:25.000000000 +0000 @@ -32,6 +32,7 @@ let global_config = ref (FilePath.concat let lock = ref "ben.lock" let update = ref false let tconfig = ref None +let redownload = ref true open Benl_types open Benl_frontend @@ -71,6 +72,8 @@ let read_global_config () = Ben_monitor.baseurl := url | "template", (EString template) -> Benl_templates.load_template template; + | "redownload", Efalse -> + redownload := false | "output-type", (EString format) -> (match String.lowercase format with | "text" -> Ben_monitor.output_type := Text @@ -169,7 +172,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 @@ -180,7 +183,7 @@ let update_test () = let update_cache () = let () = clear_cache () in - if not !Benl_data.use_projectb then Ben_download.download_all () + if !redownload && not !Benl_data.use_projectb then Ben_download.download_all () let profile_of_file file = try
  6. Download patch templates/ubuntu.ml

    --- 0.6.6/templates/ubuntu.ml 1970-01-01 00:00:00.000000000 +0000 +++ 0.6.6ubuntu2/templates/ubuntu.ml 2013-11-04 14:41:10.000000000 +0000 @@ -0,0 +1,45 @@ +open Printf +open Xhtml.M + +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 + ~content:"text/html;charset=utf-8" + ~a:[a_http_equiv "Content-Type"] + ()) + :: + (link ~a:[a_rel [`Stylesheet]; a_href "media/revamp.css"] ()) + :: + (link ~a:[a_rel [`Stylesheet]; a_href "media/styles.css"] ()) + :: + headers in + html ~a:[a_xmlns `W3_org_1999_xhtml] + (head + (Xhtml.M.title (pcdata title)) + headers + ) + (Xhtml.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.01.0-3ubuntu3) trusty; urgency=medium * Rebuild for Tcl/Tk 8.6. -- Matthias Klose <doko@ubuntu.com> Thu, 02 Jan 2014 20:05:45 +0100 ocaml (4.01.0-3ubuntu2) trusty; urgency=medium * Disable the testsocket test, trying to reach the net. -- Matthias Klose <doko@ubuntu.com> Mon, 23 Dec 2013 00:07:52 +0100 ocaml (4.01.0-3ubuntu1) trusty; urgency=low * Merge with Debian; remaining changes: - Pass --hash-style=both --as-needed --build-id to the linker. -- Matthias Klose <doko@ubuntu.com> Sun, 22 Dec 2013 11:13:10 +0100

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

    --- 4.01.0-3/debian/patches/linker-flags.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.01.0-3ubuntu3/debian/patches/linker-flags.patch 2013-12-22 10:22:36.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";;
  3. Download patch debian/rules

    --- 4.01.0-3/debian/rules 2013-12-02 17:40:05.000000000 +0000 +++ 4.01.0-3ubuntu3/debian/rules 2013-12-22 23:14:30.000000000 +0000 @@ -286,6 +286,8 @@ SLOW_ARCHITECTURES := armel armhf ia64 m .PHONY: override_dh_auto_test override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + : # tries to connect the net + rm -f testsuite/tests/lib-threads/testsocket.* ifneq (,$(filter $(DEB_BUILD_ARCH),$(SLOW_ARCHITECTURES))) rm -f testsuite/tests/misc-unsafe/almabench.ml endif
  4. Download patch debian/control

    --- 4.01.0-3/debian/control 2013-12-02 19:02:48.000000000 +0000 +++ 4.01.0-3ubuntu3/debian/control 2013-12-22 10:17:55.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.01.0-3/debian/control.in 2013-12-02 17:40:05.000000000 +0000 +++ 4.01.0-3ubuntu3/debian/control.in 2013-12-22 10:17:49.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.01.0-3/.pc/applied-patches 2014-01-02 21:36:28.998409402 +0000 +++ 4.01.0-3ubuntu3/.pc/applied-patches 2014-01-02 21:36:30.098437980 +0000 @@ -13,3 +13,4 @@ 0013-Tune-resource-usage-of-some-tests.patch 0014-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch 0015-Fix-native-backtraces-on-arm.patch +linker-flags.patch
  7. Download patch configure

    --- 4.01.0-3/configure 2014-01-02 21:36:28.000000000 +0000 +++ 4.01.0-3ubuntu3/configure 2014-01-02 21:36:30.000000000 +0000 @@ -305,7 +305,9 @@ case "$bytecc,$host" 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" @@ -747,7 +749,8 @@ case "$arch,$nativecc,$system,$host_type 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";;
  8. Download patch debian/patches/series

    --- 4.01.0-3/debian/patches/series 2013-12-02 17:40:05.000000000 +0000 +++ 4.01.0-3ubuntu3/debian/patches/series 2013-12-22 23:14:44.000000000 +0000 @@ -13,3 +13,4 @@ 0013-Tune-resource-usage-of-some-tests.patch 0014-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch 0015-Fix-native-backtraces-on-arm.patch +linker-flags.patch
  1. ben
  2. ocaml