[Pkg-ocaml-maint-commits] r6176 - in /trunk/packages/ocamlweb/trunk/debian: changelog control dirs ocamlweb.dirs rules rules.debhelper

Mon Feb 16 19:55:28 UTC 2009

Author: treinen
Date: Mon Feb 16 19:55:27 2009
New Revision: 6176

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6176
Log:
convert to cdbs

Added:
    trunk/packages/ocamlweb/trunk/debian/ocamlweb.dirs   (props changed)
      - copied unchanged from r6175, trunk/packages/ocamlweb/trunk/debian/dirs
    trunk/packages/ocamlweb/trunk/debian/rules.debhelper   (with props)
Removed:
    trunk/packages/ocamlweb/trunk/debian/dirs
Modified:
    trunk/packages/ocamlweb/trunk/debian/changelog
    trunk/packages/ocamlweb/trunk/debian/control
    trunk/packages/ocamlweb/trunk/debian/rules

Modified: trunk/packages/ocamlweb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/changelog?rev=6176&op=diff
==============================================================================

--- trunk/packages/ocamlweb/trunk/debian/changelog (original)
+++ trunk/packages/ocamlweb/trunk/debian/changelog Mon Feb 16 19:55:27 2009
@@ -2,11 +2,13 @@
 
   [ Ralf Treinen ]
   * Depends: add ${misc:Depends} (closes: Bug#515178).
+  * Convert to cdbs, build-depend on cdbs and dh-ocaml.
+  * Rename debian/dirs to debian/ocamlweb.dirs
 
   [ Stephane Glondu ]
   * Remove Julien from Uploaders
 
- -- Stephane Glondu <steph at glondu.net>  Sun, 15 Feb 2009 21:07:34 +0100
+ -- Ralf Treinen <treinen at debian.org>  Mon, 16 Feb 2009 20:40:43 +0100
 
 ocamlweb (1.37-9) unstable; urgency=low
 

Modified: trunk/packages/ocamlweb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/control?rev=6176&op=diff
==============================================================================
--- trunk/packages/ocamlweb/trunk/debian/control (original)
+++ trunk/packages/ocamlweb/trunk/debian/control Mon Feb 16 19:55:27 2009
@@ -5,7 +5,7 @@
 Uploaders: Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
 Standards-Version: 3.8.0
 Build-Depends-Indep: ocaml-nox (>= 3.07)
-Build-Depends: debhelper (>= 4.0), dpatch, tex-common
+Build-Depends: debhelper (>= 4.0), dpatch, tex-common, cdbs, dh-ocaml
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/
 Homepage: http://www.lri.fr/~filliatr/ocamlweb/index.en.html

Propchange: trunk/packages/ocamlweb/trunk/debian/ocamlweb.dirs
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/packages/ocamlweb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/rules?rev=6176&op=diff
==============================================================================
--- trunk/packages/ocamlweb/trunk/debian/rules (original)
+++ trunk/packages/ocamlweb/trunk/debian/rules Mon Feb 16 19:55:27 2009
@@ -1,55 +1,18 @@
 #!/usr/bin/make -f
-# debian/rules for ocamlweb
 
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-include /usr/share/dpatch/dpatch.make
-
-OCAMLABI = $(shell ocamlc -version)
-
-configure: Makefile
-Makefile: patch
-	dh_testdir
-	./configure\
-		--prefix=`pwd`/debian/ocamlweb/usr/\
-		--mandir=`pwd`/debian/ocamlweb/usr/share/man	
-
-build: Makefile ocamlweb
-ocamlweb: 
-	dh_testdir
-	$(MAKE) byte
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	if [ -e Makefile ]; then $(MAKE) dist-clean; fi
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install-byte UPDATETEX=true
+install/ocamlweb::
 	cp doc/ocamlweb-*-man.html \
 		debian/ocamlweb/usr/share/doc/ocamlweb/ocamlweb-man.html
 
-binary-arch: build install
+DEB_CONFIGURE_NORMAL_ARGS = \
+	--prefix=$(DEB_DESTDIR)/usr/\
+	--mandir=$(DEB_DESTDIR)/usr/share/man
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs CHANGES
-	dh_installtex
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI=$(OCAMLABI)
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
-
+# we have decided to build this package as bytecode
+DEB_MAKE_BUILD_TARGET = byte
+DEB_MAKE_INSTALL_TARGET = install-byte UPDATETEX=true

Added: trunk/packages/ocamlweb/trunk/debian/rules.debhelper
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlweb/trunk/debian/rules.debhelper?rev=6176&op=file
==============================================================================
--- trunk/packages/ocamlweb/trunk/debian/rules.debhelper (added)
+++ trunk/packages/ocamlweb/trunk/debian/rules.debhelper Mon Feb 16 19:55:27 2009
@@ -1,0 +1,55 @@
+#!/usr/bin/make -f
+# debian/rules for ocamlweb
+
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+OCAMLABI = $(shell ocamlc -version)
+
+configure: Makefile
+Makefile: patch
+	dh_testdir
+	./configure\
+		--prefix=`pwd`/debian/ocamlweb/usr/\
+		--mandir=`pwd`/debian/ocamlweb/usr/share/man	
+
+build: Makefile ocamlweb
+ocamlweb: 
+	dh_testdir
+	$(MAKE) byte
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	if [ -e Makefile ]; then $(MAKE) dist-clean; fi
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install-byte UPDATETEX=true
+	cp doc/ocamlweb-*-man.html \
+		debian/ocamlweb/usr/share/doc/ocamlweb/ocamlweb-man.html
+
+	binary-arch: build install
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs CHANGES
+	dh_installtex
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol -- -VF:OCamlABI=$(OCAMLABI)
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+

Propchange: trunk/packages/ocamlweb/trunk/debian/rules.debhelper
------------------------------------------------------------------------------
    svn:executable = *


