Author: treinen
Date: Fri May 18 21:02:46 2007
New Revision: 3766
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3766
Log:
add copyright, fix bug in rules
Added:
trunk/packages/ocamlmakefile/trunk/debian/copyright
Modified:
trunk/packages/ocamlmakefile/trunk/debian/ (props changed)
trunk/packages/ocamlmakefile/trunk/debian/control
trunk/packages/ocamlmakefile/trunk/debian/dirs
trunk/packages/ocamlmakefile/trunk/debian/rules
Propchange: trunk/packages/ocamlmakefile/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Modified: trunk/packages/ocamlmakefile/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/control?rev=3766&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/control (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/control Fri May 18 21:02:46 2007
@@ -2,9 +2,9 @@
Section: devel
Priority: extra
Maintainer: Debian OCaml Maintainers <[EMAIL PROTECTED]>
-Uploaders: Ralf Treinen <[EMAIL PROTECTED]>,
- Sven Luther <[EMAIL PROTECTED]>, Remi Vanicat <[EMAIL PROTECTED]>,
- Stefano Zacchiroli <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL PROTECTED]>
+Uploaders: Ralf Treinen <[EMAIL PROTECTED]>,
+ Remi Vanicat <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL PROTECTED]>,
+ Stefano Zacchiroli <[EMAIL PROTECTED]>, Sven Luther <[EMAIL PROTECTED]>,
Build-Depends: debhelper (>= 4.0)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-tools
@@ -13,6 +13,8 @@
Package: ocamlmakefile
Architecture: all
Depends:
+Conflicts: ocaml-tools (<= 2007.02.04-2)
+Replaces: ocaml-tools
Description: a general makefile for the Objective Caml programming language
Ocamlmakefile is a general makefile which allows a programmer to
create quickly custmize makefiles for a project written in Objective
Added: trunk/packages/ocamlmakefile/trunk/debian/copyright
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/copyright?rev=3766&op=file
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/copyright (added)
+++ trunk/packages/ocamlmakefile/trunk/debian/copyright Fri May 18 21:02:46 2007
@@ -1,0 +1,24 @@
+This package was debianized by Ralf Treinen <[EMAIL PROTECTED]> on
+Fri, 18 May 2007 22:22:08 +0200
+
+It was downloaded from http://www.ocaml.info/home/ocaml_sources.html#toc16
+
+Upstream Author:
+
+ Markus Mottl <[EMAIL PROTECTED]>
+
+Copyright:
+
+ Copyright (C) 1999-2007 Markus Mottl
+
+License:
+
+ This software is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, version 2.1.
+
+On Debian systems you can find a copy of this license in
+/usr/share/common-licenses/LGPL.
+
+The Debian packaging is (C) 2007, Ralf Treinen <[EMAIL PROTECTED]>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: trunk/packages/ocamlmakefile/trunk/debian/dirs
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/dirs?rev=3766&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/dirs (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/dirs Fri May 18 21:02:46 2007
@@ -1,7 +1,3 @@
-usr/share/doc/ocaml-tools
-usr/share/doc/ocaml-tools/examples.ocamlmake
-usr/bin
-usr/share/ocaml-tools
-usr/share/ocaml-tools/omlet
-usr/share/man/man1
-usr/share/lintian/overrides
+usr/share/doc/ocamlmakefile
+usr/share/doc/ocamlmakefile/examples
+usr/share/ocamlmakefile
Modified: trunk/packages/ocamlmakefile/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/rules?rev=3766&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/rules (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/rules Fri May 18 21:02:46 2007
@@ -4,10 +4,10 @@
#export DH_VERBOSE=1
# top level dir for documentation
-export DOCDIR=debian/ocaml-tools/usr/share/doc/ocamlmakefile
+export DOCDIR=debian/ocamlmakefile/usr/share/doc/ocamlmakefile
# share dir where files are to be installed
-export SHDIR=debian/ocaml-tools/usr/share/ocamlmakefile
+export SHDIR=debian/ocamlmakefile/usr/share/ocamlmakefile
build: buildstamp
buildstamp:
@@ -31,7 +31,7 @@
> $(DOCDIR)/examples/$$f/Makefile;\
done
cp debian/README.examples.idl $(DOCDIR)/examples/calc/README
- cp debian/README.examples idl $(DOCDIR)/examples/idl/README
+ cp debian/README.examples.idl $(DOCDIR)/examples/idl/README
sed "s|/usr/local/lib|/usr/lib|" < OCamlMakefile \
> $(SHDIR)/OCamlMakefile
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
