[Pkg-ocaml-maint-commits] r3296 - in /trunk/packages/camlidl/trunk/debian: camlidl.dirs camlidl.dirs.in changelog compat control control.in patches/37_make.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Sat Nov 4 00:14:46 CET 2006 

Author: gildor
Date: Sat Nov  4 00:14:46 2006
New Revision: 3296

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3296
Log:
* Migrate to CDBS,
-- SLG

Added:
    trunk/packages/camlidl/trunk/debian/camlidl.dirs.in
      - copied, changed from r3272, trunk/packages/camlidl/trunk/debian/camlidl.dirs
Removed:
    trunk/packages/camlidl/trunk/debian/camlidl.dirs
Modified:
    trunk/packages/camlidl/trunk/debian/changelog
    trunk/packages/camlidl/trunk/debian/compat
    trunk/packages/camlidl/trunk/debian/control
    trunk/packages/camlidl/trunk/debian/control.in
    trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch
    trunk/packages/camlidl/trunk/debian/rules

Copied: trunk/packages/camlidl/trunk/debian/camlidl.dirs.in (from r3272, trunk/packages/camlidl/trunk/debian/camlidl.dirs)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/camlidl.dirs.in?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/camlidl.dirs (original)
+++ trunk/packages/camlidl/trunk/debian/camlidl.dirs.in Sat Nov  4 00:14:46 2006
@@ -1,1 +1,2 @@
 usr/bin
+ at OCamlStdlibDir@/caml

Modified: trunk/packages/camlidl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/changelog?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/changelog (original)
+++ trunk/packages/camlidl/trunk/debian/changelog Sat Nov  4 00:14:46 2006
@@ -1,3 +1,11 @@
+camlidl (1.05-7) unstable; urgency=low
+
+  * Use CDBS for debian/rules,
+  * De-hijack the package, use @OCAML_TEAM@ in control.in,
+  * Upgrade debhelper debian/compat to 5.
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sat,  4 Nov 2006 00:11:11 +0100
+
 camlidl (1.05-6) unstable; urgency=low
 
   * Hijack the package, with the permission of Debian OCaml Maintainer,

Modified: trunk/packages/camlidl/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/compat?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/compat (original)
+++ trunk/packages/camlidl/trunk/debian/compat Sat Nov  4 00:14:46 2006
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/camlidl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/control?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/control (original)
+++ trunk/packages/camlidl/trunk/debian/control Sat Nov  4 00:14:46 2006
@@ -2,10 +2,10 @@
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox (>= 3.09.2), dpatch
+Uploaders:  Julien Cristau <julien.cristau at ens-lyon.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), cpp, binutils
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlidl
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlidl
 
 Package: camlidl
 Section: devel

Modified: trunk/packages/camlidl/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/control.in?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/control.in (original)
+++ trunk/packages/camlidl/trunk/debian/control.in Sat Nov  4 00:14:46 2006
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox (>= #OCamlABI#), dpatch
+Uploaders: @OCamlTeam@
+Build-Depends: @cdbs@, cpp, binutils
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlidl
 

Modified: trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch (original)
+++ trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch Sat Nov  4 00:14:46 2006
@@ -109,7 +109,7 @@
  # Clean up
  clean::
 -	rm -f *.cm[ioax] $.cmxa *~
-+	rm -f *.cm[ioax] *.cmxa *.a *.o *~
++	-$(RM) -f *.cm[ioax] *.cmxa *.a *.o *~
  
  # Dependencies
  depend:

Modified: trunk/packages/camlidl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlidl/trunk/debian/rules?rev=3296&op=diff
==============================================================================
--- trunk/packages/camlidl/trunk/debian/rules (original)
+++ trunk/packages/camlidl/trunk/debian/rules Sat Nov  4 00:14:46 2006
@@ -1,66 +1,46 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules for mlpcap package
+# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-OCAMLIBDIR=$(shell ocamlc -where)
-OCAMLABI=$(shell ocamlc -version)
+PACKAGE := camlidl
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
 
-debian/control: debian/control.in
-	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
-	
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
+DEB_MAKE_CLEAN_TARGET    := clean
+DEB_MAKE_BUILD_TARGET    := all 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    += opt 
+endif
+DEB_MAKE_INSTALL_TARGET  := install DESTDIR="$(DESTDIR)"
+
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+
+clean::
+	-$(RM) lib/com.cmxa lib/com.a lib/com.o 
+	-$(RM) config/Makefile
+
+common-configure-indep common-configure-arch::
 	cp config/Makefile.unix config/Makefile
-	$(MAKE) all
-	# TODO: check for byte compilation
-	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
-		$(MAKE) opt; \
-	else \
-		true; \
-	fi 
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	-$(MAKE) clean
-	-$(RM) *.cm[ioax] *.cmxa *.a *.o *~
-	-$(RM) lib/*.cm[ioax] lib/*.cmxa lib/*.a lib/*.o 
-	-$(RM) config/Makefile
-	-$(RM) build-stamp
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	mkdir -p $(CURDIR)/debian/camlidl/$(OCAMLIBDIR)/caml
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/camlidl
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_installchangelogs Changes
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install patch unpatch clean1 debian/control
-

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