[Pkg-ocaml-maint-commits] r3958 - in /trunk/packages/camlp4s/trunk/debian: camlp4s.doc-base camlp5.docs camlp5.install changelog control copyright dirs docs patches/ patches/00dpatch.conf patches/00list patches/install_destdir.dpatch rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Tue Jul 10 19:51:31 UTC 2007


Author: zack
Date: Tue Jul 10 19:51:31 2007
New Revision: 3958

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3958
Log:
first working version of the package

Added:
    trunk/packages/camlp4s/trunk/debian/camlp5.docs
      - copied, changed from r3957, trunk/packages/camlp4s/trunk/debian/docs
    trunk/packages/camlp4s/trunk/debian/camlp5.install
    trunk/packages/camlp4s/trunk/debian/patches/
    trunk/packages/camlp4s/trunk/debian/patches/00dpatch.conf
    trunk/packages/camlp4s/trunk/debian/patches/00list
    trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch   (with props)
Removed:
    trunk/packages/camlp4s/trunk/debian/camlp4s.doc-base
    trunk/packages/camlp4s/trunk/debian/dirs
    trunk/packages/camlp4s/trunk/debian/docs
Modified:
    trunk/packages/camlp4s/trunk/debian/changelog
    trunk/packages/camlp4s/trunk/debian/control
    trunk/packages/camlp4s/trunk/debian/copyright
    trunk/packages/camlp4s/trunk/debian/rules

Copied: trunk/packages/camlp4s/trunk/debian/camlp5.docs (from r3957, trunk/packages/camlp4s/trunk/debian/docs)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/camlp5.docs?rev=3958&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/docs (original)
+++ trunk/packages/camlp4s/trunk/debian/camlp5.docs Tue Jul 10 19:51:31 2007
@@ -1,1 +1,4 @@
 README
+DEVEL
+UPGRADING
+doc/html

Added: trunk/packages/camlp4s/trunk/debian/camlp5.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/camlp5.install?rev=3958&op=file
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/camlp5.install (added)
+++ trunk/packages/camlp4s/trunk/debian/camlp5.install Tue Jul 10 19:51:31 2007
@@ -1,0 +1,1 @@
+debian/tmp/usr/			/

Modified: trunk/packages/camlp4s/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/changelog?rev=3958&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/changelog (original)
+++ trunk/packages/camlp4s/trunk/debian/changelog Tue Jul 10 19:51:31 2007
@@ -1,6 +1,6 @@
 camlp4s (4.03-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release (Closes: #432587)
 
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 10 Jul 2007 20:11:32 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 10 Jul 2007 21:15:45 +0200
 

Modified: trunk/packages/camlp4s/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/control?rev=3958&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/control (original)
+++ trunk/packages/camlp4s/trunk/debian/control Tue Jul 10 19:51:31 2007
@@ -1,12 +1,29 @@
 Source: camlp4s
-Section: unknown
+Section: devel
 Priority: extra
-Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), dpatch, ocaml-nox
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlp4s
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/
 
-Package: camlp4s
+Package: camlp5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: Pre Processor Pretty Printer for OCaml - classical version
+ Objective Caml (OCaml) is an implementation of the ML language,
+ based on the Caml Light dialect extended with a complete
+ class-based object system and a powerful module system in the
+ style of Standard ML.
+ .
+ CamlP4 is a Pre-Processor-Pretty-Printer for Objective Caml. It
+ offers tools for syntax (Stream Parsers and Grammars) and the
+ ability to modify the concrete syntax of the language
+ (Quotations, Syntax Extensions).
+ .
+ This package contains the "classical" version of CamlP4
+ executables and libraries for pre-processing and pretty-printing
+ OCaml sources both interactively and in a batch fashion. The
+ "classical" version is the implementation of CamlP4 which used
+ to be distributed with OCaml before the release of version 3.10.

Modified: trunk/packages/camlp4s/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/copyright?rev=3958&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/copyright (original)
+++ trunk/packages/camlp4s/trunk/debian/copyright Tue Jul 10 19:51:31 2007
@@ -1,24 +1,21 @@
 This package was debianized by Stefano Zacchiroli <zack at debian.org> on
-Tue, 10 Jul 2007 11:32:36 +0200.
+Tue, 10 Jul 2007 20:57:36 +0200.
 
-It was downloaded from <url://example.com>
+It was downloaded from http://cristal.inria.fr/~ddr/camlp4s/
 
-Upstream Author(s): 
+Upstream Author: 
 
-    <put author's name and email here>
-    <likewise for another author>
+    Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
 
 Copyright: 
 
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
+    Copyright (c) 2007, INRIA (Institut National de Recherches en Informatique et Automatique)
 
 License:
 
-    <Put the license of the package here indented by 4 spaces>
+    CamlP4 is licensed under the BSD license (with the exception of the
+    copyright, which is by INRIA), see `/usr/share/common-licenses/BSD'.
 
 The Debian packaging is (C) 2007, Stefano Zacchiroli <zack at debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

Added: trunk/packages/camlp4s/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/patches/00dpatch.conf?rev=3958&op=file
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/patches/00dpatch.conf (added)
+++ trunk/packages/camlp4s/trunk/debian/patches/00dpatch.conf Tue Jul 10 19:51:31 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: trunk/packages/camlp4s/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/patches/00list?rev=3958&op=file
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/patches/00list (added)
+++ trunk/packages/camlp4s/trunk/debian/patches/00list Tue Jul 10 19:51:31 2007
@@ -1,0 +1,1 @@
+install_destdir.dpatch

Added: trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch?rev=3958&op=file
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch (added)
+++ trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch Tue Jul 10 19:51:31 2007
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable installation of stuff under $(DESTDIR)/ via overriding of all
+## DP: path variables defined in config/Makefile (created by ./configure)
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-07-10 16:09:05.000000000 +0200
++++ trunk/Makefile	2007-07-10 21:33:33.000000000 +0200
+@@ -40,10 +40,13 @@
+ 	for i in $(DIRS) compile; do (cd $$i; $(MAKE) depend); done
+ 
+ install:
+-	@test ! -d "$(LIBDIR)/$(NAME)/Camlp4Parsers" || \
+-	 (/bin/rm -rf "$(LIBDIR)/ocamlp4"; \
+-	  mv "$(LIBDIR)/$(NAME)" "$(LIBDIR)/o$(NAME)")
+-	for i in $(DIRS) compile; do (cd $$i; $(MAKE) install); done
++	for i in $(DIRS) compile; do (cd $$i; \
++		$(MAKE) install \
++			OLIBDIR=$(DESTDIR)$(OLIBDIR) \
++			BINDIR=$(DESTDIR)$(BINDIR) \
++			LIBDIR=$(DESTDIR)$(LIBDIR) \
++			MANDIR=$(DESTDIR)$(MANDIR) \
++	); done
+ 
+ uninstall:
+ 	rm -rf "$(LIBDIR)/$(NAME)"

Propchange: trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/camlp4s/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/rules?rev=3958&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/rules (original)
+++ trunk/packages/camlp4s/trunk/debian/rules Tue Jul 10 19:51:31 2007
@@ -1,6 +1,26 @@
 #!/usr/bin/make -f
-  
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-# Add here any variable or target overrides you need.
+PKGNAME = camlp5
+
+CONFIGURE_FLAGS =
+CONFIGURE_FLAGS += -name camlp5
+CONFIGURE_FLAGS += -mandir /usr/share/man
+
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET = world.opt
+else
+DEB_MAKE_BUILD_TARGET = world
+endif
+
+configure/$(PKGNAME):: debian/configure-stamp
+debian/configure-stamp:
+	./configure $(CONFIGURE_FLAGS)
+	touch debian/configure-stamp
+clean::
+	rm -f debian/configure-stamp
+




More information about the Pkg-ocaml-maint-commits mailing list