monotone on Debian

monotone on Debian Commit Details

Date:2015-07-08 22:58:00 (2 years 5 months ago)
Author:Markus Wanner
Branch:org.debian.monotone-viz
Commit:97b10a3e121ff168f6eb165ff02e4da4b7b307f8
Parents: 857fd4c8898fd68170c768ef891112e1c312880d
Message:Finalize 1.0.2-4 for upload to unstable.

* debian/control: add myself as an uploader, bump S-V
* patches/50-ocaml-4.02.2.diff: added
Changes:
Apatches/50-ocaml-4.02.2.diff (full)
Mchangelog (1 diff)
Mcontrol (1 diff)
Mpatches/series (1 diff)

File differences

changelog
1
2
3
4
5
6
7
8
9
110
211
312
monotone-viz (1.0.2-4) unstable; urgency=medium
* Add myself as an uploader.
* Add patch by St├ęphane Glondu to fix compilation with OCaml 4.02.2
(Closes: #790062)
* Bumped S-V to 3.9.6.0: no changes needed.
-- Markus Wanner <markus@bluegap.ch> Tue, 07 Jul 2015 20:38:57 +0200
monotone-viz (1.0.2-3) unstable; urgency=low
* Update control file to mark monotone-viz as part of vcs section. This fixes
control
55
66
77
8
8
9
910
1011
1112
1213
1314
1415
15
16
1617
1718
1819
Uploaders: Richard Levitte <richard@levitte.org>,
Zack Weinberg <zackw@panix.com>,
Ludovic Brenta <lbrenta@debian.org>,
Francis Russell <francis@unchartedbackwaters.co.uk>
Francis Russell <francis@unchartedbackwaters.co.uk>,
Markus Wanner <markus@bluegap.ch>
Homepage: http://oandrieu.nerim.net/monotone-viz/
Vcs-Mtn: mtn://monotone.ca/debian-mtn?org.debian.monotone-viz
Vcs-Browser: https://code.monotone.ca/p/debian-mtn/source/tree/h:org.debian.monotone-viz/
Build-Depends: debhelper (>= 9), dh-ocaml, liblablgtk2-gnome-ocaml-dev,
gawk, pkg-config, camlp4, quilt, libglib2.0-dev, libgnomecanvas2-dev,
libgtk2.0-dev
Standards-Version: 3.9.5.0
Standards-Version: 3.9.6.0
Package: monotone-viz
Architecture: any
patches/50-ocaml-4.02.2.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
Description: Fix compilation with OCaml 4.02.2
Author: Stephane Glondu <steph@glondu.net>
Date: Sat Jun 27 10:44:41 2015 +0200
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790062
diff --git a/app.ml b/app.ml
index 96a1348..37a195b 100644
--- a/app.ml
+++ b/app.ml
@@ -1,56 +1,4 @@
-class type status =
- object
- method push : string -> unit
- method pop : unit -> unit
- method progress_start : string -> int -> unit
- method progress : int -> unit
- method progress_end : unit -> unit
- method with_status : string -> (unit -> 'a) -> 'a
- end
-
-class type t =
- object
- method get_mtn : Monotone.t option
- method get_agraph : Agraph.t option
- method get_prefs : Viz_style.prefs
- method get_toplevel : GWindow.window
-
- method set_prefs : Viz_style.prefs -> unit
-
- method open_db : ?id:string -> ?branch:string -> string -> unit
- method close_db : unit -> unit
- method finalize : unit -> unit
- method display_certs : string -> unit
- method focus_find_entry : unit -> unit
- method get_current_cert_value : string option
- method reload : unit -> unit
- method zoom_in : unit -> unit
- method zoom_out : unit -> unit
- method re_layout : unit -> unit
- method redraw : unit -> unit
- method query : Viz_types.select_info -> unit
- method get_selected_node : string option
- method find : string -> unit
- method switch_branch : string * string -> unit
- method update_begin : unit
- method update_end : unit
- method center_on :string * Viz_types.c_node -> unit
- method center_on_by_id : string -> unit
- method view_popup : string * int -> unit
- method cert_popup : int -> unit
-
- method show_open : unit -> unit
- method show_view : unit -> unit
- method show_search : unit -> unit
- method show_prefs : unit -> unit
- method show_diff : string -> string -> unit
-
- method status : string -> status
-
- method error_notice : string -> unit
- end
-
-
+open App_types
open Viz_misc
class ctrl w ~prefs ~manager ~status ~view : t =
diff --git a/app.mli b/app.mli
index b35740b..88c4d4d 100644
--- a/app.mli
+++ b/app.mli
@@ -1,53 +1,2 @@
-class type status =
- object
- method push : string -> unit
- method pop : unit -> unit
- method progress_start : string -> int -> unit
- method progress : int -> unit
- method progress_end : unit -> unit
- method with_status : string -> (unit -> 'a) -> 'a
- end
-
-class type t =
- object
- method get_mtn : Monotone.t option
- method get_agraph : Agraph.t option
- method get_prefs : Viz_style.prefs
- method get_toplevel : GWindow.window
-
- method set_prefs : Viz_style.prefs -> unit
-
- method open_db : ?id:string -> ?branch:string -> string -> unit
- method close_db : unit -> unit
- method finalize : unit -> unit
- method display_certs : string -> unit
- method focus_find_entry : unit -> unit
- method get_current_cert_value : string option
- method reload : unit -> unit
- method zoom_in : unit -> unit
- method zoom_out : unit -> unit
- method re_layout : unit -> unit
- method redraw : unit -> unit
- method query : Viz_types.select_info -> unit
- method get_selected_node : string option
- method find : string -> unit
- method switch_branch : string * string -> unit
- method update_begin : unit
- method update_end : unit
- method center_on :string * Viz_types.c_node -> unit
- method center_on_by_id : string -> unit
- method view_popup : string * int -> unit
- method cert_popup : int -> unit
-
- method show_open : unit -> unit
- method show_view : unit -> unit
- method show_search : unit -> unit
- method show_prefs : unit -> unit
- method show_diff : string -> string -> unit
-
- method status : string -> status
-
- method error_notice : string -> unit
- end
-
+open App_types
val make : GWindow.window -> aa:bool -> prefs:Viz_style.prefs -> t
diff --git a/app_types.mli b/app_types.mli
new file mode 100644
index 0000000..0351193
--- /dev/null
+++ b/app_types.mli
@@ -0,0 +1,51 @@
+class type status =
+ object
+ method push : string -> unit
+ method pop : unit -> unit
+ method progress_start : string -> int -> unit
+ method progress : int -> unit
+ method progress_end : unit -> unit
+ method with_status : string -> (unit -> 'a) -> 'a
+ end
+
+class type t =
+ object
+ method get_mtn : Monotone.t option
+ method get_agraph : Agraph.t option
+ method get_prefs : Viz_style.prefs
+ method get_toplevel : GWindow.window
+
+ method set_prefs : Viz_style.prefs -> unit
+
+ method open_db : ?id:string -> ?branch:string -> string -> unit
+ method close_db : unit -> unit
+ method finalize : unit -> unit
+ method display_certs : string -> unit
+ method focus_find_entry : unit -> unit
+ method get_current_cert_value : string option
+ method reload : unit -> unit
+ method zoom_in : unit -> unit
+ method zoom_out : unit -> unit
+ method re_layout : unit -> unit
+ method redraw : unit -> unit
+ method query : Viz_types.select_info -> unit
+ method get_selected_node : string option
+ method find : string -> unit
+ method switch_branch : string * string -> unit
+ method update_begin : unit
+ method update_end : unit
+ method center_on :string * Viz_types.c_node -> unit
+ method center_on_by_id : string -> unit
+ method view_popup : string * int -> unit
+ method cert_popup : int -> unit
+
+ method show_open : unit -> unit
+ method show_view : unit -> unit
+ method show_search : unit -> unit
+ method show_prefs : unit -> unit
+ method show_diff : string -> string -> unit
+
+ method status : string -> status
+
+ method error_notice : string -> unit
+ end
diff --git a/query.mli b/query.mli
index 714c034..08c3171 100644
--- a/query.mli
+++ b/query.mli
@@ -1,5 +1,5 @@
type t
-val make : #App.t -> t
+val make : #App_types.t -> t
val clear : t -> unit
val activate : t -> unit
diff --git a/ui.mli b/ui.mli
index f102fb8..4d06d14 100644
--- a/ui.mli
+++ b/ui.mli
@@ -26,37 +26,37 @@ val category :
class status_bar :
packing:(GObj.widget -> unit) ->
string ->
- App.status
+ App_types.status
module Prefs : sig
val update_prefs :
- #App.t ->
+ #App_types.t ->
Viz_style.prefs -> Viz_style.prefs -> unit
- val show : #App.t -> unit -> unit
+ val show : #App_types.t -> unit -> unit
end
module Open : sig
type t
- val make : #App.t -> t
+ val make : #App_types.t -> t
val show : t -> string option
end
(*
module LockedDB : sig
- val show : #App.t -> [`FAIL | `RETRY]
+ val show : #App_types.t -> [`FAIL | `RETRY]
end
*)
type manager
val make : unit -> manager * GObj.widget * GObj.widget
-val setup : manager -> #App.t -> unit
+val setup : manager -> #App_types.t -> unit
val popup :
- manager -> #App.t ->
+ manager -> #App_types.t ->
popup_id:string -> int -> unit
val popup_cert : manager -> int -> unit
-val open_db : manager -> #App.t -> unit
-val close_db : manager -> #App.t -> unit
+val open_db : manager -> #App_types.t -> unit
+val close_db : manager -> #App_types.t -> unit
val clear : manager -> unit
val update_begin : manager -> unit
diff --git a/unidiff.mli b/unidiff.mli
index 8e3f999..3798d2a 100644
--- a/unidiff.mli
+++ b/unidiff.mli
@@ -1 +1 @@
-val show : #App.t -> string -> string -> unit
+val show : #App_types.t -> string -> string -> unit
diff --git a/view.mli b/view.mli
index 0765ca6..eab83cd 100644
--- a/view.mli
+++ b/view.mli
@@ -1,7 +1,7 @@
module Info_Display :
sig
type t
- val fetch_and_display_data : t -> #App.t -> string -> unit
+ val fetch_and_display_data : t -> #App_types.t -> string -> unit
val get_current_cert_value : t -> string option
end
@@ -10,23 +10,23 @@ module Branch_selector :
type t
type state
val get_state : t -> state
- val set_state : t -> #App.t -> ?id:string -> state -> unit
- val set_branch : t -> #App.t -> ?id:string -> string -> unit
+ val set_state : t -> #App_types.t -> ?id:string -> state -> unit
+ val set_branch : t -> #App_types.t -> ?id:string -> string -> unit
val present_dialog : t -> unit
end
module Canvas :
sig
type t
- val zoom : t -> #App.t -> [< `IN | `OUT ] -> unit -> unit
- val id_size : t -> #App.t -> int * int * int
- val center_on : t -> #App.t -> string * Viz_types.c_node -> unit
+ val zoom : t -> #App_types.t -> [< `IN | `OUT ] -> unit -> unit
+ val id_size : t -> #App_types.t -> int * int * int
+ val center_on : t -> #App_types.t -> string * Viz_types.c_node -> unit
end
module Find :
sig
type t
- val locate : t -> #App.t -> string -> unit
+ val locate : t -> #App_types.t -> string -> unit
val focus_find_entry : t -> unit
end
@@ -42,10 +42,10 @@ val make :
parent:#GWindow.window_skel ->
pack_find_entry:(GObj.widget -> unit) ->
pack_canvas:(GObj.widget -> unit) -> t
-val setup : t -> #App.t -> unit
+val setup : t -> #App_types.t -> unit
-val clear : t -> #App.t -> unit
-val close_db : t -> #App.t -> unit
-val open_db : t -> #App.t -> unit
-val update : t -> #App.t -> string option -> unit
+val clear : t -> #App_types.t -> unit
+val close_db : t -> #App_types.t -> unit
+val open_db : t -> #App_types.t -> unit
+val update : t -> #App_types.t -> string option -> unit
val get_selected_node : t -> string option
patches/series
33
44
55
6
20-dot-rankdir.diff
30-dynamic-c-bindings.diff
40-hardening.diff
50-ocaml-4.02.2.diff

Archive Download the corresponding diff file

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status