--- monotone-viz-1.0.2.orig/debian/README.source +++ monotone-viz-1.0.2/debian/README.source @@ -0,0 +1,19 @@ +The Debian packaging for monotone-viz is stored in the org.debian.monotone branch +of the upstream version control system (monotone.ca). This branch is intended to +be checked out as the "debian" subfolder within an upstream release. + +Patches to the upstream source are currently handled using quilt. To apply and +remove them, use dh_quilt_patch and dh_quilt_unpatch commands, respectively. +Future patches against the source should use quilt if possible. See +/usr/share/doc/quilt/README.source for instructions for adding or modifying +patches. + +For Debian version N and upstream version X, this sequence of +commands should provide a fully-patched source (1.0.2-2 onwards). + +$ wget http://oandrieu.nerim.net/monotone-viz/monotone-${X}.tar.gz +$ tar -zxf monotone-viz-${X}.tar.gz +$ cd monotone-viz-${X} +$ mtn clone -r t:debian-monotone-viz-${X}-${N} monotone.ca \ + org.debian.monotone-viz debian +$ dh_quilt_patch --- monotone-viz-1.0.2.orig/debian/changelog +++ monotone-viz-1.0.2/debian/changelog @@ -0,0 +1,110 @@ +monotone-viz (1.0.2-2build2) trusty; urgency=medium + + * Rebuild for ocaml-4.01. + + -- Matthias Klose Mon, 23 Dec 2013 20:27:20 +0000 + +monotone-viz (1.0.2-2build1) oneiric; urgency=low + + * Rebuild for OCaml 3.12.0. + + -- Colin Watson Tue, 17 May 2011 08:34:02 +0100 + +monotone-viz (1.0.2-2) unstable; urgency=low + + [Francis Russell] + * Use quilt to apply patches. + * Apply changes from the net.venge.monotone-viz.new-stdio branch to support + the new automate interface added in Monotone 0.46. Closes: #574562. + * Remove unused build option '--with-shared-sqlite'. + * Call update-menus in postinst and postrm. Fixes Lintian error. + * Add ${misc:Depends} to binary package dependencies for debhelper. Fixes + Lintian warning. + * Updated debhelper compatibility level to 7 and added a Build-Depends entry. + Fixes more Lintian warnings. + * Remove copyright information for extlib and ocamlnet which monotone-viz no + longer bundles. + * Update to Debian policy 3.9.0 (added README.source). + * Place C bindings in a shared library. This allows us to avoid using + -custom on platforms where there isn't a native-code OCaml compiler. + Closes: #549463. + + [Ludovic Brenta] + * debian/rules: delete files generated by configure. + * debian/control (Uploaders): add Francis. + + -- Francis Russell Wed, 14 Jul 2010 14:35:13 +0100 + +monotone-viz (1.0.2-1) unstable; urgency=low + + * Gratefully acknowledge the NMU. Thanks, Stefano. + * New upstream version. Closes: #574562. + * Apply patch from Stéphane Gimenez to work around a bug in dot. + Closes: #573634. + * version.ml: update to 1.0.2. + * debian/menu: update to the menu structure in Menu sub-policy 3.8.4.0. + + -- Ludovic Brenta Sat, 27 Mar 2010 14:26:33 +0100 + +monotone-viz (1.0.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Rename stub for g_io_channel_read_chars, to avoid name clash with + recent lablgtk2. Patch from Fedore by Thomas Moschny. Fix FTBFS. + (Closes: #527731) + + -- Stefano Zacchiroli Fri, 02 Oct 2009 19:19:45 +0200 + +monotone-viz (1.0.1-1) unstable; urgency=low + + [Richared Levitte] + * New upstream release. Closes: #494558. + * Updated the Debian policy to version 3.7.3. + + [Ludovic Brenta] + * debian/control + (Maintainer and Uploaders): Formally adopt the package. Closes: #494705. + (Homepage): new. + * debian/rules (clean): do not call $(MAKE); config.make is not + guaranteed to exist, so the upstream Makefile gives a fatal error. + * debian/menu: new. + + -- Ludovic Brenta Tue, 12 Aug 2008 15:26:01 +0200 + +monotone-viz (0.15-3) unstable; urgency=medium + + * Add camlp4 to the build dependencies. Closes: #441506. + + -- Shaun Jackman Tue, 2 Oct 2007 12:44:58 -0700 + +monotone-viz (0.15-2) unstable; urgency=low + + * Add ocaml-nox to the build dependencies. Closes: #441506. + + -- Shaun Jackman Mon, 10 Sep 2007 10:02:56 -0700 + +monotone-viz (0.15-1) unstable; urgency=low + + * New upstream release. + * Updated the Debian policy to version 3.7.2.2. + + -- Shaun Jackman Fri, 20 Oct 2006 10:54:30 -0600 + +monotone-viz (0.14-3) unstable; urgency=low + + * Add libssl-dev to the build dependencies. + + -- Shaun Jackman Thu, 13 Apr 2006 14:41:05 -0600 + +monotone-viz (0.14-2) unstable; urgency=low + + * Add liblablgtk2-gnome-ocaml-dev to the build dependencies. + Closes: #361737. Thanks to Frederik Schüler . + + -- Shaun Jackman Mon, 10 Apr 2006 09:29:38 -0600 + +monotone-viz (0.14-1) unstable; urgency=low + + * Initial release. Closes: #305508, #318023. + + -- Shaun Jackman Tue, 21 Mar 2006 09:39:15 -0700 --- monotone-viz-1.0.2.orig/debian/compat +++ monotone-viz-1.0.2/debian/compat @@ -0,0 +1 @@ +7 --- monotone-viz-1.0.2.orig/debian/control +++ monotone-viz-1.0.2/debian/control @@ -0,0 +1,24 @@ +Source: monotone-viz +Section: devel +Priority: optional +Maintainer: Debian Maintainers for Monotone +Uploaders: Richard Levitte , + Zack Weinberg , + Ludovic Brenta , + Francis Russell +Homepage: http://oandrieu.nerim.net/monotone-viz/ +Build-Depends: debhelper (>= 7), dh-ocaml, liblablgtk2-gnome-ocaml-dev, gawk, pkg-config, debhelper, camlp4, + quilt, libglib2.0-dev, libgnomecanvas2-dev, libgtk2.0-dev +Standards-Version: 3.9.0 + +Package: monotone-viz +Architecture: any +Depends: graphviz, ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends} +Recommends: monotone +Description: visualize a monotone repository + Monotone-viz is a small GTK+ application that visualizes monotone + ancestry graphs. Monotone is a free distributed version control + system. Montone-viz is developed in the Objective Caml language, + using the GTK+ and libgnomecanvas libraries (via LablGTK, an OCaml + binding for GTK+), and it uses the dot program from the Graphviz + package. --- monotone-viz-1.0.2.orig/debian/copyright +++ monotone-viz-1.0.2/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Shaun Jackman on +2006-03-21. + +It was downloaded from http://oandrieu.nerim.net/monotone-viz/. + +Upstream Author: Olivier Andrieu + +Copyright: + +* monotone-viz + +Copyright 2006 Olivier Andrieu + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General Public License +can be found in the file /usr/share/common-licenses/GPL. + --- monotone-viz-1.0.2.orig/debian/docs +++ monotone-viz-1.0.2/debian/docs @@ -0,0 +1 @@ +README --- monotone-viz-1.0.2.orig/debian/manpages +++ monotone-viz-1.0.2/debian/manpages @@ -0,0 +1 @@ +debian/monotone-viz.1 --- monotone-viz-1.0.2.orig/debian/menu +++ monotone-viz-1.0.2/debian/menu @@ -0,0 +1,2 @@ +?package(monotone-viz):needs="X11" section="Applications/Programming"\ + title="Monotone-viz" command="/usr/bin/monotone-viz" --- monotone-viz-1.0.2.orig/debian/monotone-viz.1 +++ monotone-viz-1.0.2/debian/monotone-viz.1 @@ -0,0 +1,38 @@ +.TH MONOTONE-VIZ "1" "March 2006" "monotone-viz 0.14" "User Commands" +.SH NAME +monotone-viz \- visualize a monotone repository +.SH SYNOPSIS +\fBmonotone\-viz\fR [\fIOPTION\fR]... [\fBDB\fR [\fBBRANCH\fR [\fBREVISION\fR]]] +.SH DESCRIPTION +View the monotone repository, DB, at the specified BRANCH and +REVISION. DB, BRANCH, and REVISION default to the values in MT/options +and MT/revision. +.TP +\fB\-noaa\fR +don't use an anti\-aliased canvas +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit +.SH FILES +.TP +MT/options +The default database and branch are stored in this file. +.TP +MT/revision +The default revision is stored in this file. +.SH COPYRIGHT +Copyright 2006 Olivier Andrieu +.SH AUTHOR +Written by Olivier Andrieu . + +This manual page was written by Shaun Jackman +for the Debian system. +.SH "REPORTING BUGS" +Report bugs to . +.SH "SEE ALSO" +\fBmonotone\fR(1) +.br +http://oandrieu.nerim.net/monotone-viz/ --- monotone-viz-1.0.2.orig/debian/monotone-viz.postinst +++ monotone-viz-1.0.2/debian/monotone-viz.postinst @@ -0,0 +1,15 @@ +#!/bin/sh +# postinst script for monotone-viz +# +# see: dh_installdeb(1) + +set -e + +# We need this file to pull in the auto-generated files from dh_installmenu. + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- monotone-viz-1.0.2.orig/debian/monotone-viz.postrm +++ monotone-viz-1.0.2/debian/monotone-viz.postrm @@ -0,0 +1,15 @@ +#!/bin/sh +# postrm script for monotone-viz +# +# see: dh_installdeb(1) + +set -e + +# We need this file to pull in the auto-generated files from dh_installmenu. + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- monotone-viz-1.0.2.orig/debian/patches/00-gio-multiple-definition.diff +++ monotone-viz-1.0.2/debian/patches/00-gio-multiple-definition.diff @@ -0,0 +1,45 @@ +This patch from Thomas Moschny fixes a FTBFS that occurred in 1.0.1-1 (Debian +bug #527731) due to multiple definitions of the symbol +'ml_g_io_channel_read_chars'. + +As of 1.0.2-2, this no longer appear to be an issue, but keeping the patch has +no ill-effects at this time. +Index: monotone-viz-1.0.2.orig/glib/giochannel.ml +=================================================================== +--- monotone-viz-1.0.2.orig.orig/glib/giochannel.ml 2010-07-14 01:27:49.260404157 +0100 ++++ monotone-viz-1.0.2.orig/glib/giochannel.ml 2010-07-14 01:32:48.758146722 +0100 +@@ -24,7 +24,7 @@ + + external read_chars : t -> ?off:int -> ?len:int -> string -> + [ `NORMAL of int | `AGAIN | `EOF] +- = "_ml_g_io_channel_read_chars" ++ = "_ml_mtnviz_g_io_channel_read_chars" + external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string -> + [ `NORMAL of int | `AGAIN] + = "ml_g_io_channel_write_chars" +Index: monotone-viz-1.0.2.orig/glib/giochannel.mli +=================================================================== +--- monotone-viz-1.0.2.orig.orig/glib/giochannel.mli 2010-07-14 01:27:49.244394579 +0100 ++++ monotone-viz-1.0.2.orig/glib/giochannel.mli 2010-07-14 01:32:48.757147319 +0100 +@@ -20,7 +20,7 @@ + + external read_chars : t -> ?off:int -> ?len:int -> string -> + [ `NORMAL of int | `AGAIN | `EOF] +- = "_ml_g_io_channel_read_chars" ++ = "_ml_mtnviz_g_io_channel_read_chars" + (** @raise Error . + @raise Glib.Convert.Error .*) + external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string -> +Index: monotone-viz-1.0.2.orig/glib/ocaml-giochannel.c +=================================================================== +--- monotone-viz-1.0.2.orig.orig/glib/ocaml-giochannel.c 2010-07-14 01:27:49.273400862 +0100 ++++ monotone-viz-1.0.2.orig/glib/ocaml-giochannel.c 2010-07-14 01:32:48.758146722 +0100 +@@ -134,7 +134,7 @@ + #endif + + CAMLprim value +-_ml_g_io_channel_read_chars (value c, value o_off, value o_len, value s) ++_ml_mtnviz_g_io_channel_read_chars (value c, value o_off, value o_len, value s) + { + CAMLparam1(s); + GError *err = NULL; --- monotone-viz-1.0.2.orig/debian/patches/10-new-stdio.diff +++ monotone-viz-1.0.2/debian/patches/10-new-stdio.diff @@ -0,0 +1,135 @@ +Patch from monotone-viz 1.0.2 release to the new-stdio branch which adds support +for the new monotone automate interface that appeared in 0.46. + +Command to generate and expanded revisions identifiers: +$mtn diff -r t:monotone-viz-1.0.2 -r h:net.venge.monotone-viz.new-stdio +mtn: expanding selection 't:monotone-viz-1.0.2' +mtn: expanded to '78a87d334b15645b2bb54afec96ac5d3e1e45350' +mtn: expanding selection 'h:net.venge.monotone-viz.new-stdio' +mtn: expanded to 'b34ff2e695b53c2d73d533a3ffa7cb081b48eefb' +Index: monotone-viz-1.0.2.orig/automate.ml +=================================================================== +--- monotone-viz-1.0.2.orig.orig/automate.ml 2010-07-14 00:53:19.831147460 +0100 ++++ monotone-viz-1.0.2.orig/automate.ml 2010-07-14 00:53:25.864394272 +0100 +@@ -44,7 +44,7 @@ + | `OUTPUT of string + | `ERROR of string + | `SYNTAX_ERROR of string] +-type chunk = command_id * int * bool * string ++type chunk = command_id * bool * string + type process = { + p_in : in_watch ; + p_out : out_watch ; +@@ -152,7 +152,7 @@ + try + match Giochannel.read_chars w.out_w.w_chan w.out_sb with + | `NORMAL read -> +- if debug then log "%s cb: read %d" w.out_w.w_name read ; ++ if debug then log "%s cb: read %d" w.out_w.w_name read; + Buffer.add_substring w.out_buffer w.out_sb 0 read ; + w.out_cb w.out_buffer + | `EOF -> +@@ -258,8 +258,8 @@ + + + +-let find_four_colon b = +- let to_find = ref 4 in ++let find_three_colon b = ++ let to_find = ref 3 in + let i = ref 0 in + while !to_find > 0 do + let c = Buffer.nth b !i in +@@ -277,22 +277,20 @@ + + let decode_stdio_chunk b = + try +- let header_len = find_four_colon b in ++ let header_len = find_three_colon b in + let h = Buffer.sub b 0 header_len in + let c1 = String.index_from h 0 ':' in + let number = int_of_string (string_slice ~e:c1 h) in +- let code = int_of_char h.[c1 + 1] - int_of_char '0' in + let c2 = String.index_from h (c1 + 1) ':' in +- let last = h.[c2 + 1] in ++ let last = h.[c1 + 1] in + let c3 = String.index_from h (c2 + 1) ':' in +- let c4 = String.index_from h (c3 + 1) ':' in +- let len = int_of_string (string_slice ~s:(c3 + 1) ~e:c4 h) in ++ let len = int_of_string (string_slice ~s:(c2 + 1) ~e:c3 h) in + if Buffer.length b < header_len + len + then + `INCOMPLETE + else + let data = truncate_buffer b header_len len in +- `CHUNK (number, code, last = 'l', data) ++ `CHUNK (number, last = 'l', data) + with Invalid_argument _ -> + `INCOMPLETE + +@@ -305,11 +303,11 @@ + | `INCOMPLETE -> + () + +- | `CHUNK (nb, _, _, _) when aborted_cmd p nb -> ++ | `CHUNK (nb, _, _) when aborted_cmd p nb -> + p.chunks <- List.remove_assoc nb p.chunks ; + out_cb p b + +- | `CHUNK ((nb, code, false, data) as chunk) -> ++ | `CHUNK ((nb, false, data) as chunk) -> + if debug then log "decoded a chunk" ; + let previous_chunks = + try List.assoc nb p.chunks +@@ -320,7 +318,7 @@ + previous_chunks := chunk :: !previous_chunks ; + out_cb p b + +- | `CHUNK ((nb, code, true, data) as chunk) -> ++ | `CHUNK ((nb, true, data) as chunk) -> + if debug then log "decoded last chunk" ; + let chunks = + try +@@ -333,14 +331,14 @@ + p.callbacks <- List.remove_assoc nb p.callbacks ; + let msg = + String.concat "" +- (List.map (fun (_, _, _, d) -> d) chunks) in +- let data = +- match code with +- | 0 -> `OUTPUT msg +- | 1 -> `SYNTAX_ERROR msg +- | 2 -> `ERROR msg ++ (List.map (function (_, false, d) -> d | (_, true, d) -> "") chunks) in ++ let code = ++ match data with ++ | "0" -> `OUTPUT msg ++ | "1" -> `SYNTAX_ERROR msg ++ | "2" -> `ERROR msg + | _ -> failwith "invalid_code in automate stdio output" in +- ignore (Glib.Idle.add ~prio:0 (fun () -> cb data ; false)) ; ++ ignore (Glib.Idle.add ~prio:0 (fun () -> cb code ; false)) ; + out_cb p b + + +@@ -409,6 +407,20 @@ + chunks = [] ; + exit_cb = (fun _ -> assert false) + } in ++ let rec check_version buf = ++ if String.contains buf '\n' then ++ String.length buf >= 18 && String.sub buf 0 18 = "format-version: 2\n" ++ else ++ match Giochannel.read_chars p.p_out.out_w.w_chan p.p_out.out_sb with ++ | `NORMAL read -> check_version (buf ^ String.sub p.p_out.out_sb 0 read) ++ | `EOF -> ++ Giochannel.shutdown p.p_out.out_w.w_chan false; ++ Giochannel.shutdown p.p_err.out_w.w_chan false; ++ failwith "mtn version 0.46 or above is required"; ++ | `AGAIN -> check_version buf ++ in ++ if not (check_version "") ++ then failwith "mtn stdio uses an unknown format-version"; + let pid = some child.Gspawn.pid in + ignore (Gspawn.add_child_watch ~prio:50 pid (reap_cb p pid)) ; + p.p_out.out_cb <- out_cb p ; --- monotone-viz-1.0.2.orig/debian/patches/20-dot-rankdir.diff +++ monotone-viz-1.0.2/debian/patches/20-dot-rankdir.diff @@ -0,0 +1,36 @@ +This patch from Stéphane Gimenez uses "rankdir=BT" rather than the -y option to +dot to flip the revision graph's direction. The -y option to dot broke +previously (Debian bug #563634) causing displaced arrows. The problem in dot has +since been fixed, but it's still possible people might encounter it. Also, it +looks like this patch will be committed upstream anyway. +Index: monotone-viz-1.0.2.orig/agraph.ml +=================================================================== +--- monotone-viz-1.0.2.orig.orig/agraph.ml 2010-07-14 04:08:57.769153696 +0100 ++++ monotone-viz-1.0.2.orig/agraph.ml 2010-07-14 04:08:59.882151155 +0100 +@@ -50,8 +50,9 @@ + agraph.nodes in + + !+ "digraph \"monotone-viz\"\n{\n" ; +- if params.lr_layout then +- !+ " graph [rankdir=LR] ;\n" ; ++ if params.lr_layout ++ then !+ " graph [rankdir=LR] ;\n" ++ else !+ " graph [rankdir=BT] ;\n" ; + !+ " graph [ranksep=\"0.25\"] ;\n" ; + !+ " node [label=\"\"] ;\n" ; + +@@ -222,11 +223,11 @@ + let dot_prg = graph.layout_params.dot_program in + let cmd = + if Viz_misc.debug "dot" +- then [ "/bin/sh" ; "-c" ; ++ then [ "/bin/bash" ; "-c" ; + Printf.sprintf + "set -o pipefail ; \ +- tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ] +- else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in ++ tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ] ++ else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in + let error fmt = + Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in + try --- monotone-viz-1.0.2.orig/debian/patches/30-dynamic-c-bindings.diff +++ monotone-viz-1.0.2/debian/patches/30-dynamic-c-bindings.diff @@ -0,0 +1,73 @@ +The upstream Makefile constructs a static library containing C functions exposed +to OCaml that call functions in glib, pango and gnomecanvas. On a system where +there is no native-code OCaml compiler, the only way to link to this is to use +the -custom flag which the Debian OCaml maintainers have deprecated. The -custom +flag will result in an OCaml bytecode interpreter being embedded in the +monotone-viz executable on non-native platforms. This has security implications +if there's a security issue found in this interpreter. There are also security +issues with linking to static libraries, although not with monotone-viz as it +doesn't embed 3rd party static libraries. Lastly, calling strip on such an +executable will remove the bytecode in its entirety, rendering it useless. + +This patch moves the C bindings into a dynamic library. This allows us to avoid +using the -custom flag. On non-native platforms, the monotone-viz executable will +now call the OCaml runtime instead. This fixes Debian bug #549463. +Index: monotone-viz-1.0.2.orig/Makefile +=================================================================== +--- monotone-viz-1.0.2.orig.orig/Makefile 2010-07-14 18:33:11.914403966 +0100 ++++ monotone-viz-1.0.2.orig/Makefile 2010-07-14 18:34:44.416729074 +0100 +@@ -56,23 +56,23 @@ + LIB3RDPARTY_OBJ = $(C_OBJ) + + ifeq ($(OCAMLBEST), opt) +-monotone-viz : $(OBJX) lib3rdparty.a +- $(OCAMLOPT) -o $@ -I $(LABLGTK_DIR) $(MLLIBS) $^ ++monotone-viz : $(OBJX) dll3rdparty.so ++ $(OCAMLOPT) -o $@ -ccopt -Wl,-rpath=$(libdir)/monotone-viz/ -I $(LABLGTK_DIR) $(MLLIBS) $(OBJX) -cclib -l:dll3rdparty.so + monotone-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa + ifeq ($(LOCAL_LABLGTK), yes) + $(OBJX) : .lablgtk + endif + else +-monotone-viz : $(OBJ) lib3rdparty.a +- $(OCAMLC) -custom -o $@ -I $(LABLGTK_DIR) $(MLLIBS) $^ ++monotone-viz : $(OBJ) dll3rdparty.so ++ $(OCAMLC) -o $@ -dllpath $(libdir)/monotone-viz/ -I $(LABLGTK_DIR) $(MLLIBS) $(OBJ) -dllib -l3rdparty + monotone-viz : MLLIBS = str.cma lablgtk.cma gtkInit.cmo lablgnomecanvas.cma + ifeq ($(LOCAL_LABLGTK), yes) + $(OBJ) : .lablgtk + endif + endif + +-lib3rdparty.a : $(C_OBJ) +- ar crs lib3rdparty.a $(LIB3RDPARTY_OBJ) ++dll3rdparty.so : $(C_OBJ) ++ ocamlmklib $(LIB3RDPARTY_OBJ) -o 3rdparty + + glib/ocaml-gspawn.o : glib/gspawn_tags.c glib/gspawn_tags.h + glib/ocaml-giochannel.o : glib/giochannel_tags.c glib/giochannel_tags.h +@@ -116,9 +116,12 @@ + install -d $(DESTDIR)$(bindir) + install -m 0755 monotone-viz \ + $(DESTDIR)$(bindir)/`echo monotone-viz | sed '$(transform)'` ++ install -d $(DESTDIR)$(libdir)/monotone-viz ++ install -m 0644 dll3rdparty.so $(DESTDIR)$(libdir)/monotone-viz + + uninstall : + rm -f $(DESTDIR)$(bindir)/`echo monotone-viz | sed '$(transform)'` ++ rm -f $(DESTDIR)$(libdir)/monotone-viz/dll3rdparty.so + + .PHONY : clean dist + +Index: monotone-viz-1.0.2.orig/config.make.in +=================================================================== +--- monotone-viz-1.0.2.orig.orig/config.make.in 2010-07-14 18:33:11.922401768 +0100 ++++ monotone-viz-1.0.2.orig/config.make.in 2010-07-14 18:33:12.237403641 +0100 +@@ -20,6 +20,7 @@ + prefix := @prefix@ + exec_prefix := @exec_prefix@ + bindir := @bindir@ ++libdir := @libdir@ + transform := @program_transform_name@ + + NAME := @PACKAGE_NAME@ --- monotone-viz-1.0.2.orig/debian/patches/series +++ monotone-viz-1.0.2/debian/patches/series @@ -0,0 +1,4 @@ +00-gio-multiple-definition.diff +10-new-stdio.diff +20-dot-rankdir.diff +30-dynamic-c-bindings.diff --- monotone-viz-1.0.2.orig/debian/rules +++ monotone-viz-1.0.2/debian/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +# patching +include /usr/share/quilt/quilt.make + +build: build-stamp +build-stamp: + $(MAKE) -f debian/rules patch + ./configure --prefix=/usr + $(MAKE) + touch $@ + +install: build + dh_prep + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/monotone-viz + +clean: + rm -f build-stamp + dh_clean + rm -f *.a *.so *.o *.cm* monotone-viz + rm -f dot_lexer.ml dot_parser.ml dot_parser.mli basic_io_lexer.ml + cd glib && rm -f *.o *.cm* + rm -f config.status config.make config.log + rm -rf .depend version.ml + rm -f glib/spawn_tags.[ch] glib/giochannel_tags.[ch] glib/gspawn_tags.[ch] + $(MAKE) -f debian/rules unpatch + + +binary-indep: + +binary-arch binary: install + dh_installchangelogs -a NEWS + dh_installdocs -a + dh_installman -a + dh_installmenu -a + dh_compress -a + dh_fixperms -a + dh_strip -a + dh_makeshlibs -a + dh_shlibdeps -a + dh_ocaml -a + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +.PHONY: build install clean binary-indep binary-arch binary --- monotone-viz-1.0.2.orig/debian/watch +++ monotone-viz-1.0.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://oandrieu.nerim.net/monotone-viz/ monotone-viz-(.*)-nolablgtk\.tar\.gz debian uupdate