[Pkg-ocaml-maint-commits] r1964 - trunk/packages/ocamli18n/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 17:20:59 +0000 (Wed, 09 Nov 2005)
New Revision: 1964

Removed:
   trunk/packages/ocamli18n/trunk/debian/libocamli18n-ocaml-dev.dirs
Modified:
   trunk/packages/ocamli18n/trunk/debian/changelog
   trunk/packages/ocamli18n/trunk/debian/control
   trunk/packages/ocamli18n/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference -- SLG


Modified: trunk/packages/ocamli18n/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamli18n/trunk/debian/changelog	2005-11-09 17:07:12 UTC (rev 1963)
+++ trunk/packages/ocamli18n/trunk/debian/changelog	2005-11-09 17:20:59 UTC (rev 1964)
@@ -1,3 +1,10 @@
+ocamli18n (0.3-3) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+  * Upgrade to standards version 3.6.2.0 (no change)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 18:13:12 +0100
+
 ocamli18n (0.3-2) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/ocamli18n/trunk/debian/control
===================================================================
--- trunk/packages/ocamli18n/trunk/debian/control	2005-11-09 17:07:12 UTC (rev 1963)
+++ trunk/packages/ocamli18n/trunk/debian/control	2005-11-09 17:20:59 UTC (rev 1964)
@@ -4,7 +4,7 @@
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
 Uploaders: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>, Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>
 Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch, ocaml-findlib, libpxp-ocaml-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.0
 
 Package: libocamli18n-ocaml-dev
 Architecture: any

Deleted: trunk/packages/ocamli18n/trunk/debian/libocamli18n-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocamli18n/trunk/debian/libocamli18n-ocaml-dev.dirs	2005-11-09 17:07:12 UTC (rev 1963)
+++ trunk/packages/ocamli18n/trunk/debian/libocamli18n-ocaml-dev.dirs	2005-11-09 17:20:59 UTC (rev 1964)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3

Modified: trunk/packages/ocamli18n/trunk/debian/rules
===================================================================
--- trunk/packages/ocamli18n/trunk/debian/rules	2005-11-09 17:07:12 UTC (rev 1963)
+++ trunk/packages/ocamli18n/trunk/debian/rules	2005-11-09 17:20:59 UTC (rev 1964)
@@ -5,39 +5,27 @@
 
 include /usr/share/dpatch/dpatch.make
 
-OCAML_LIBDIR := $(shell ocamlc -where)
-
+OCAMLIBDIR := $(shell ocamlc -where)
 DESTDIR = $(CURDIR)/debian/libocamli18n-ocaml-dev
 
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-
-	touch configure-stamp
-
 build: build-stamp
-
-build-stamp: configure-stamp patch-stamp
+build-stamp: patch-stamp
 	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) DESTDIR=$(OCAML_LIBDIR)/ocamli18n all
+	$(MAKE) DESTDIR=$(OCAMLIBDIR)/ocamli18n all
 	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ] ; then \
-	  $(MAKE) DESTDIR=$(OCAML_LIBDIR)/ocamli18n opt; \
+	  $(MAKE) DESTDIR=$(OCAMLIBDIR)/ocamli18n opt; \
 	fi
-	cd src && $(MAKE) DESTDIR=$(OCAML_LIBDIR)/ocamli18n htdoc
-
+	cd src && $(MAKE) DESTDIR=$(OCAMLIBDIR)/ocamli18n htdoc
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
+	rm -f build-stamp 
 	-$(MAKE) clean
 	-$(RM) -r doc
-
+	-$(RM) src/generate_parser.cmo src/generate_parser.cmi src/generate_parser
 	dh_clean
 
 install: build
@@ -45,21 +33,10 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	$(MAKE) install OCAMLFIND_DESTDIR="$(DESTDIR)/$(OCAML_LIBDIR)"
+	mkdir -p "$(DESTDIR)/$(OCAMLIBDIR)"
+	$(MAKE) install OCAMLFIND_DESTDIR="$(DESTDIR)/$(OCAMLIBDIR)"
 	
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+binary-indep: 
 
 binary-arch: build install
 	dh_testdir -a