[Pkg-ocaml-maint-commits] r1261 - in trunk/packages/regexp-pp/trunk/debian: . patches

Samuel Mimram smimram-guest@costa.debian.org
Wed, 13 Apr 2005 18:59:36 +0000 

Author: smimram-guest
Date: 2005-04-13 18:59:36 +0000 (Wed, 13 Apr 2005)
New Revision: 1261

Added:
   trunk/packages/regexp-pp/trunk/debian/patches/
   trunk/packages/regexp-pp/trunk/debian/patches/00list
   trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch
Modified:
   trunk/packages/regexp-pp/trunk/debian/changelog
   trunk/packages/regexp-pp/trunk/debian/control
   trunk/packages/regexp-pp/trunk/debian/copyright
   trunk/packages/regexp-pp/trunk/debian/rules
Log:
Ready for OCaml 3.08.3.

Modified: trunk/packages/regexp-pp/trunk/debian/changelog
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/changelog	2005-04-12 22:23:20 UTC (rev 1260)
+++ trunk/packages/regexp-pp/trunk/debian/changelog	2005-04-13 18:59:36 UTC (rev 1261)
@@ -1,3 +1,12 @@
+regexp-pp (0.9.5.1-3) unstable; urgency=medium
+
+  * New maintainer: Debian OCaml Maintainers.
+  * Updated to OCaml 3.08.3.
+  * Using dpatch to handle patches.
+  * Updated Standards-Version to 3.6.1.1.
+
+ -- Samuel Mimram <smimram@debian.org>  Sun,  3 Apr 2005 23:29:01 +0200
+
 regexp-pp (0.9.5.1-2) unstable; urgency=low
 
   * Rebuilt for new ocaml version.

Modified: trunk/packages/regexp-pp/trunk/debian/control
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/control	2005-04-12 22:23:20 UTC (rev 1260)
+++ trunk/packages/regexp-pp/trunk/debian/control	2005-04-13 18:59:36 UTC (rev 1261)
@@ -1,13 +1,14 @@
 Source: regexp-pp
 Section: devel
 Priority: optional
-Maintainer: John Goerzen <jgoerzen@complete.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.08.2), ocaml-findlib (>= 1.0.4-2), libpcre-ocaml-dev (>= 5.08.1-1), ocaml-tools
-Standards-Version: 3.6.0
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Samuel Mimram <smimram@debian.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, ocaml-findlib (>= 1.0.4-2), libpcre-ocaml-dev (>= 5.08.1-1), ocaml-tools, dpatch
+Standards-Version: 3.6.1.1
 
 Package: libregexp-pp-ocaml-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpcre-ocaml-dev, ocaml-nox (>= 3.08.2), ocaml-findlib
+Depends: libpcre-ocaml-dev, ocaml-nox-3.08.3, ocaml-findlib
 Description: Syntax extension for OCaml to make Regexp usage much easier
  Regexp/OCaml provides convenient syntax sugar for regular expression
  match for strings using PCRE/OCaml library. The features of this macro

Modified: trunk/packages/regexp-pp/trunk/debian/copyright
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/copyright	2005-04-12 22:23:20 UTC (rev 1260)
+++ trunk/packages/regexp-pp/trunk/debian/copyright	2005-04-13 18:59:36 UTC (rev 1261)
@@ -3,7 +3,7 @@
 
 It was downloaded from http://web.yl.is.s.u-tokyo.ac.jp/~oiwa/caml/#regexp-pp
 
-Upstream Author(s): Yutaka Oiwa <oiwa@yl.is.s.u-tokyo.ac.jp>
+Upstream Author: Yutaka Oiwa <oiwa@yl.is.s.u-tokyo.ac.jp>
 
 Copyright:
 
@@ -144,4 +144,3 @@
 The Software and this license document are provided AS IS with NO
 WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN,
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-

Added: trunk/packages/regexp-pp/trunk/debian/patches/00list
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/patches/00list	2005-04-12 22:23:20 UTC (rev 1260)
+++ trunk/packages/regexp-pp/trunk/debian/patches/00list	2005-04-13 18:59:36 UTC (rev 1261)
@@ -0,0 +1 @@
+makefiles

Added: trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch	2005-04-12 22:23:20 UTC (rev 1260)
+++ trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch	2005-04-13 18:59:36 UTC (rev 1261)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefiles.dpatch by John Goerzen <jgoerzen@complete.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Cleaner installation and compilation rules.
+
+@DPATCH@
+diff -urNad regexp-pp-0.9.5.1.orig/OCamlMakefile /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/OCamlMakefile
+--- regexp-pp-0.9.5.1.orig/OCamlMakefile	2004-09-27 18:17:41.000000000 +0200
++++ /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/OCamlMakefile	2005-04-03 23:42:20.000000000 +0200
+@@ -148,9 +148,7 @@
+ TOPRESULT := $(addsuffix $(TOPSUFFIX), $(RESULT))
+ 
+ ifndef OCAMLFIND
+-  ifndef PACKS
+-    OCAMLFIND := ocamlfind
+-  endif
++  OCAMLFIND := ocamlfind
+ endif
+ 
+ export OCAMLFIND
+@@ -912,7 +910,7 @@
+ .PHONY: libinstall
+ libinstall:	all
+ 	$(QUIET)printf "\nInstalling library with ocamlfind\n"
+-	$(OCAMLFIND) install $(RESULT) META $(LIBINSTALL_FILES)
++	$(OCAMLFIND) install -destdir $(DESTDIR)/`ocamlc -where` $(RESULT) META $(LIBINSTALL_FILES)
+ 	$(QUIET)printf "\nInstallation successful.\n"
+ 
+ .PHONY: libuninstall
+diff -urNad regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile
+--- regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile	2004-09-27 18:17:39.000000000 +0200
++++ /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile	2005-04-03 23:42:10.000000000 +0200
+@@ -32,7 +32,7 @@
+ 
+ match-regexp-test: match-regexp-test.ml pa_regexp_match.cma
+ 	rm -f match-regexp-test$(EXE)
+-	$(MAKE) $(TEST_MAKEOPTS) native-code
++	$(MAKE) $(TEST_MAKEOPTS) `if [ -x /usr/bin/ocamlopt ]; then echo native-code; else echo byte-code; fi`
+ 
+ %.ppo: %.ml pa_regexp_match.cma
+ 	camlp4o pr_o.cmo $*.ml > $*.ppo


Property changes on: trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/regexp-pp/trunk/debian/rules
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/rules	2005-04-12 22:23:20 UTC (rev 1260)
+++ trunk/packages/regexp-pp/trunk/debian/rules	2005-04-13 18:59:36 UTC (rev 1261)
@@ -6,9 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
 
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -23,30 +23,23 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-
 	touch configure-stamp
 
 
 build: build-stamp
-
-build-stamp: configure-stamp 
+build-stamp: patch-stamp configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE) all
 	$(MAKE) test
 
-	#/usr/bin/docbook-to-man debian/regexp-pp.sgml > regexp-pp.1
-
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 	-rm pa_once/*.ppo
 
@@ -60,7 +53,6 @@
 
 	mkdir -p debian/libregexp-pp-ocaml-dev`ocamlc -where`
 
-	# Add here commands to install the package into debian/regexp-pp.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/libregexp-pp-ocaml-dev
 
 
@@ -75,26 +67,14 @@
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_install
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
+	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb