[Pkg-ocaml-maint-commits] r1963 - trunk/packages/ocamlgsl/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 17:07:12 +0000 (Wed, 09 Nov 2005)
New Revision: 1963

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


Modified: trunk/packages/ocamlgsl/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlgsl/trunk/debian/changelog	2005-11-09 16:56:51 UTC (rev 1962)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog	2005-11-09 17:07:12 UTC (rev 1963)
@@ -1,3 +1,9 @@
+ocamlgsl (0.4.0-3) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 17:57:46 +0100
+
 ocamlgsl (0.4.0-2) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.dirs	2005-11-09 16:56:51 UTC (rev 1962)
+++ trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.dirs	2005-11-09 17:07:12 UTC (rev 1963)
@@ -1,2 +1 @@
-usr/lib/ocaml/3.08.3
 usr/share/doc/libocamlgsl-ocaml-dev

Deleted: trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs
===================================================================
--- trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs	2005-11-09 16:56:51 UTC (rev 1962)
+++ trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml.dirs	2005-11-09 17:07:12 UTC (rev 1963)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs

Modified: trunk/packages/ocamlgsl/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlgsl/trunk/debian/rules	2005-11-09 16:56:51 UTC (rev 1962)
+++ trunk/packages/ocamlgsl/trunk/debian/rules	2005-11-09 17:07:12 UTC (rev 1963)
@@ -2,75 +2,50 @@
 
 include /usr/share/dpatch/dpatch.make 
 
-OCAML_LIBDIR=$(shell ocamlc -where)
+OCAMLIBDIR=$(shell ocamlc -where)
 PACKAGE_DEV=libocamlgsl-ocaml-dev
+DESTDIR_DEV=$(CURDIR)/debian/$(PACKAGE_DEV)
 PACKAGE=libocamlgsl-ocaml
+DESTDIR=$(CURDIR)/debian/$(PACKAGE)
 
-build-arch: build-arch-stamp
-build-arch-stamp:
+build: patch-stamp build-stamp
+build-stamp:
 	dh_testdir
 	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
 		$(MAKE) all-opt;\
 	else\
 		$(MAKE) all-byte;\
 	fi
-	touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp:
-	dh_testdir
-	touch build-indep-stamp
-
-build: build-stamp
-build-stamp: patch-stamp build-arch build-indep
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-$(RM) build-arch-stamp build-indep-stamp build-stamp config-stamp
+	-$(RM) build-stamp 
 	-$(MAKE) clean
 	dh_clean
 
-install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs
 	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-		$(MAKE) install-opt DESTDIR="$(CURDIR)/debian/$(PACKAGE_DEV)";\
+		$(MAKE) install-opt DESTDIR="$(DESTDIR_DEV)";\
 	else\
-		$(MAKE) install-byte DESTDIR="$(CURDIR)/debian/$(PACKAGE_DEV)";\
+		$(MAKE) install-byte DESTDIR="$(DESTDIR_DEV)";\
 	fi
-	cp -R doc $(CURDIR)/debian/$(PACKAGE_DEV)/usr/share/doc/$(PACKAGE_DEV)/html
-	$(RM) -r $(CURDIR)/debian/$(PACKAGE_DEV)/$(OCAML_LIBDIR)/stublibs
-	mv $(CURDIR)/debian/$(PACKAGE_DEV)/$(OCAML_LIBDIR)/gsl/*.so \
-	 $(CURDIR)/debian/$(PACKAGE)/$(OCAML_LIBDIR)/stublibs/
+	cp -R doc $(DESTDIR_DEV)/usr/share/doc/$(PACKAGE_DEV)/html
+	$(RM) -r $(DESTDIR_DEV)/$(OCAMLIBDIR)/stublibs
+	mv $(DESTDIR_DEV)/$(OCAMLIBDIR)/gsl/*.so \
+	 $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
 	cp $(CURDIR)/META \
-	 $(CURDIR)/debian/$(PACKAGE_DEV)/$(OCAML_LIBDIR)/gsl/META
-	chrpath -d $(CURDIR)/debian/$(PACKAGE)/$(OCAML_LIBDIR)/stublibs/*.so
+	 $(DESTDIR_DEV)/$(OCAMLIBDIR)/gsl/META
+	chrpath -d $(DESTDIR)/$(OCAMLIBDIR)/stublibs/*.so
 	  
-install-indep: DH_OPTIONS=
-install-indep: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+binary-indep:
 
-binary-indep: build install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installchangelogs -i
-	dh_installexamples -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a