[Pkg-ocaml-maint-commits] r3635 - in /trunk/packages/omake:
trunk/debian/ trunk/debian/patches/ upstream/
mfurr at users.alioth.debian.org
mfurr at users.alioth.debian.org
Fri Mar 23 21:01:49 CET 2007
Author: mfurr
Date: Fri Mar 23 20:01:15 2007
New Revision: 3635
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3635
Log:
new upstream release
Added:
trunk/packages/omake/trunk/debian/ocamldep.patch
trunk/packages/omake/upstream/omake_0.9.8.1-1.orig.tar.gz (with props)
Removed:
trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch
trunk/packages/omake/upstream/omake_0.9.6.9-1.orig.tar.gz
Modified:
trunk/packages/omake/trunk/debian/changelog
trunk/packages/omake/trunk/debian/control
trunk/packages/omake/trunk/debian/copyright
trunk/packages/omake/trunk/debian/patches/00list
trunk/packages/omake/trunk/debian/rules
Modified: trunk/packages/omake/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/changelog?rev=3635&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/changelog (original)
+++ trunk/packages/omake/trunk/debian/changelog Fri Mar 23 20:01:15 2007
@@ -1,3 +1,11 @@
+omake (0.9.8.1-1-1) unstable; urgency=low
+
+ * New upstream version (Closes: #415205)
+ * Policy version now 3.7.2 (no changes needed)
+ * Removed Makefile patch since it's no longer necessary
+
+ -- Mike Furr <mfurr at debian.org> Fri, 23 Mar 2007 15:59:23 -0400
+
omake (0.9.8-2-1) unstable; urgency=low
* New upstream version
Modified: trunk/packages/omake/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/control?rev=3635&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/control (original)
+++ trunk/packages/omake/trunk/debian/control Fri Mar 23 20:01:15 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Mike Furr <mfurr at debian.org>
Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox (>= 3.09.2), libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/omake
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/
Modified: trunk/packages/omake/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/copyright?rev=3635&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/copyright (original)
+++ trunk/packages/omake/trunk/debian/copyright Fri Mar 23 20:01:15 2007
@@ -12,3 +12,14 @@
systems, the complete text of the GNU General Public License can be
found in /usr/share/common-licenses/GPL-2.
+The ocamldep-omake binary is a modified version of the ocamldep included in
+OCaml 3.09.2 that is Copyright Institut National de Recherche en Informatique
+et en Automatique and distributed under the terms of the Q Public License
+version 1.0.
+
+The source code for the unmodified version is available at
+http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
+
+The patch that was used to compile this modified version is available from
+http://caml.inria.fr/mantis/view.php?id=4047 and is included in the Debian
+source package.
Added: trunk/packages/omake/trunk/debian/ocamldep.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/ocamldep.patch?rev=3635&op=file
==============================================================================
--- trunk/packages/omake/trunk/debian/ocamldep.patch (added)
+++ trunk/packages/omake/trunk/debian/ocamldep.patch Fri Mar 23 20:01:15 2007
@@ -1,0 +1,63 @@
+diff -u -r1.36 ocamldep.ml
+--- ocamldep.ml 24 Mar 2005 17:20:54 -0000 1.36
++++ ocamldep.ml 14 Jun 2006 02:12:35 -0000
+@@ -24,6 +24,7 @@
+ let native_only = ref false
+ let force_slash = ref false
+ let error_occurred = ref false
++let raw_flag = ref false
+
+ let add_to_load_path dir =
+ try
+@@ -58,7 +59,7 @@
+ try
+ let filename = find_file (modname ^ ".mli") in
+ let basename = Filename.chop_suffix filename ".mli" in
+- let optname =
++ let optname =
+ if Sys.file_exists (basename ^ ".ml")
+ then basename ^ ".cmx"
+ else basename ^ ".cmi" in
+@@ -119,6 +120,14 @@
+ end in
+ print_items (String.length target_file + 2) deps
+
++let print_raw_dependencies source_file deps =
++ print_string source_file;
++ print_string ":\n";
++ Depend.StringSet.iter (fun dep ->
++ print_char '\t';
++ print_string dep;
++ print_char '\n') deps
++
+ (* Optionally preprocess a source file *)
+
+ let preprocessor = ref None
+@@ -192,6 +201,9 @@
+ if Filename.check_suffix source_file ".ml" then begin
+ let ast = parse_use_file ic in
+ Depend.add_use_file Depend.StringSet.empty ast;
++ if !raw_flag then
++ print_raw_dependencies source_file !Depend.free_structure_names
++ else
+ let basename = Filename.chop_suffix source_file ".ml" in
+ let init_deps =
+ if Sys.file_exists (basename ^ ".mli")
+@@ -205,6 +217,9 @@
+ if Filename.check_suffix source_file ".mli" then begin
+ let ast = parse_interface ic in
+ Depend.add_signature Depend.StringSet.empty ast;
++ if !raw_flag then
++ print_raw_dependencies source_file !Depend.free_structure_names
++ else
+ let basename = Filename.chop_suffix source_file ".mli" in
+ let (byt_deps, opt_deps) =
+ Depend.StringSet.fold find_dependency !Depend.free_structure_names ([], []) in
+@@ -254,5 +269,7 @@
+ " (for Windows) Use forward slash / instead of backslash \\ in file paths";
+ "-version", Arg.Unit print_version,
+ " Print version and exit";
++ "-modules", Arg.Set raw_flag,
++ "Print all module dependencies in raw form (output is not suitable for make)";
+ ] file_dependencies usage;
+ exit (if !error_occurred then 2 else 0)
Modified: trunk/packages/omake/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/00list?rev=3635&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/00list (original)
+++ trunk/packages/omake/trunk/debian/patches/00list Fri Mar 23 20:01:15 2007
@@ -1,1 +1,0 @@
-10_Makefile
Modified: trunk/packages/omake/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/rules?rev=3635&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/rules (original)
+++ trunk/packages/omake/trunk/debian/rules Fri Mar 23 20:01:15 2007
@@ -42,6 +42,11 @@
dh_installdirs
$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/omake/ install
+ echo '#!/usr/bin/ocamlrun' > $(CURDIR)/debian/omake/usr/bin/ocamldep-omake.tmp
+ cat $(CURDIR)/debian/omake/usr/bin/ocamldep-omake >> \
+ $(CURDIR)/debian/omake/usr/bin/ocamldep-omake.tmp
+ mv $(CURDIR)/debian/omake/usr/bin/ocamldep-omake.tmp \
+ $(CURDIR)/debian/omake/usr/bin/ocamldep-omake
rm -f $(CURDIR)/debian/omake/usr/bin/cvs_realclean
@@ -62,7 +67,7 @@
dh_installexamples
dh_install
# dh_installman doc/man/*.1
- dh_strip
+ dh_strip -Xocamldep-omake
dh_compress -Xhtml/
dh_fixperms
dh_installdeb
Added: trunk/packages/omake/upstream/omake_0.9.8.1-1.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/upstream/omake_0.9.8.1-1.orig.tar.gz?rev=3635&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/omake/upstream/omake_0.9.8.1-1.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list