-
--- 0.9.0/media/revamp.css 2019-11-12 13:15:09.000000000 +0000
+++ 0.9.0ubuntu2/media/revamp.css 2019-11-12 16:39:51.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; }
-
--- 0.9.0/debian/control 2019-11-12 13:15:09.000000000 +0000
+++ 0.9.0ubuntu2/debian/control 2019-11-12 16:39:50.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.4.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
-
--- 0.9.0/frontends/ben_monitor.ml 2019-11-12 13:15:09.000000000 +0000
+++ 0.9.0ubuntu2/frontends/ben_monitor.ml 2020-01-31 18:16:49.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
@@ -282,7 +282,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 =
-
--- 0.9.0/lib/query.ml 2019-11-12 13:15:09.000000000 +0000
+++ 0.9.0ubuntu2/lib/query.ml 2019-11-12 16:39:51.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) ->
-
--- 0.9.0/.gitignore 2019-11-12 13:15:09.000000000 +0000
+++ 0.9.0ubuntu2/.gitignore 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-_build
-ben
-*~
-modules.png
-doc/ben.1
-doc/refman.html
-
--- 0.9.0/frontends/ben_tracker.ml 2019-11-12 13:15:09.000000000 +0000
+++ 0.9.0ubuntu2/frontends/ben_tracker.ml 2019-11-12 16:39:50.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;
-
--- 0.9.0/templates/ubuntu.ml 1970-01-01 00:00:00.000000000 +0000
+++ 0.9.0ubuntu2/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);
+ }
