[Pkg-ocaml-maint-commits] r1954 - trunk/packages/camlimages/trunk/debian

Wed Nov 9 14:53:27 UTC 2005

Author: gildor-guest
Date: 2005-11-09 14:53:21 +0000 (Wed, 09 Nov 2005)
New Revision: 1954

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


Modified: trunk/packages/camlimages/trunk/debian/META
===================================================================

--- trunk/packages/camlimages/trunk/debian/META	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/META	2005-11-09 14:53:21 UTC (rev 1954)
@@ -27,12 +27,6 @@
 archive(native)+="ci_xpm.cmxa"
 archive(native)+="ci_ps.cmxa"
 
-package "lablgtk" (
-	requires="camlimages lablgtk"
-	archive(byte)="ci_lablgtk.cma"
-	archive(native)="ci_lablgtk.cmxa"
-)
-
 package "lablgtk2" (
 	requires="camlimages lablgtk2"
 	archive(byte)="ci_lablgtk2.cma"

Modified: trunk/packages/camlimages/trunk/debian/changelog
===================================================================
--- trunk/packages/camlimages/trunk/debian/changelog	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/changelog	2005-11-09 14:53:21 UTC (rev 1954)
@@ -1,3 +1,11 @@
+camlimages (2.20-5) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+  * Remove dependency to lablgtk, only support lablgtk2
+  * Upgrade to standard version 3.6.2.0 (no change)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 15:47:48 +0100
+
 camlimages (2.20-4) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/camlimages/trunk/debian/control
===================================================================
--- trunk/packages/camlimages/trunk/debian/control	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/control	2005-11-09 14:53:21 UTC (rev 1954)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards (in Debian context) <mkedeb at sane.net>
-Build-Depends: debhelper (>> 4.0.0), ocaml-3.08.3, ocaml-findlib, libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), libungif4-dev, liblablgtk2-ocaml-dev, liblablgtk-ocaml-dev, gs, dpatch, chrpath
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.0.0), ocaml-3.08.3, ocaml-findlib, libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), libungif4-dev, liblablgtk2-ocaml-dev, gs, dpatch, chrpath
+Standards-Version: 3.6.2.0
 
 Package: libcamlimages-ocaml
 Architecture: any

Deleted: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs
===================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs	2005-11-09 14:53:21 UTC (rev 1954)
@@ -1,2 +0,0 @@
-usr/lib/ocaml/3.08.3/camlimages
-usr/lib/ocaml/3.08.3/METAS

Deleted: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.files
===================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.files	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.files	2005-11-09 14:53:21 UTC (rev 1954)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3/camlimages/*

Deleted: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs
===================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs	2005-11-09 14:53:21 UTC (rev 1954)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs

Deleted: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.files
===================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.files	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.files	2005-11-09 14:53:21 UTC (rev 1954)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3/camlimages/*.so

Modified: trunk/packages/camlimages/trunk/debian/rules
===================================================================
--- trunk/packages/camlimages/trunk/debian/rules	2005-11-09 14:26:43 UTC (rev 1953)
+++ trunk/packages/camlimages/trunk/debian/rules	2005-11-09 14:53:21 UTC (rev 1954)
@@ -1,23 +1,24 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 include /usr/share/dpatch/dpatch.make
 
 BUILD_LABLGTK2=yes
-BUILD_LABLGTK =yes
+BUILD_LABLGTK =no
 
-OCAML_LIB_DIR := $(shell ocamlc -where)
+OCAMLIBDIR := $(shell ocamlc -where)
 
 ifeq ($(BUILD_LABLGTK2),yes)
 LABLGTK2_DIR := $(shell ocamlfind query lablgtk2)
 LABGTK2_CONF  = --with-labgtk2=$(LABGTK2_DIR)
+else
+LABGTK2_CONF  = --without-labgtk2
 endif
 
 ifeq ($(BUILD_LABLGTK),yes)
 LABLGTK_DIR := $(shell ocamlfind query lablgtk)
 LABGTK_CONF  = --with-labgtk=$(LABGTK_DIR)
+else
+LABGTK_CONF  = --without-labgtk
 endif
 
 DESTDIR = $(CURDIR)/debian/libcamlimages-ocaml
@@ -29,29 +30,24 @@
 configure-stamp: patch-stamp
 	dh_testdir
 	./configure $(LABLGTK_CONF) $(LABLGTK2_CONF)
-
 	touch configure-stamp
 
 build: build-stamp
-
 build-stamp: configure-stamp patch-stamp
 	dh_testdir
-
-	# Add here commands to compile the package.
 	$(MAKE) byt
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; else true; fi
-
+	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
+		$(MAKE) opt; \
+	fi
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
 	# Clean documentation links
-	-test -L html && rm html
-	-test -L doc/index.html && rm doc/index.html
-	# Add here commands to clean up after the build process.
+	-test -L html && $(RM) html
+	-test -L doc/index.html && $(RM) doc/index.html
 	-$(MAKE) veryclean
 	-$(RM) Makefile.config
 	-$(RM) -r freetype
@@ -62,28 +58,29 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
+	# Creating install dirs
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)/camlimages
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)/METAS
+	mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs
+	# Install
 	$(MAKE) install.byt DESTDIR=$(DESTDIR_DEV)
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) install.opt DESTDIR=$(DESTDIR_DEV); else true; fi
-
-	mv -f $(DESTDIR_DEV)$(OCAML_LIB_DIR)/camlimages/*.so \
-	 $(DESTDIR)$(OCAML_LIB_DIR)/stublibs/
+	if [ -x /usr/bin/ocamlopt ]; then \
+		$(MAKE) install.opt DESTDIR=$(DESTDIR_DEV); \
+	fi
+	# Move the file to their correct destination
+	mv -f $(DESTDIR_DEV)/$(OCAMLIBDIR)/camlimages/*.so \
+	 $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
 	cp debian/META \
-	 $(DESTDIR_DEV)$(OCAML_LIB_DIR)/METAS/META.camlimages
-	chrpath -d $(DESTDIR)$(OCAML_LIB_DIR)/stublibs/*.so
+	 $(DESTDIR_DEV)/$(OCAMLIBDIR)/METAS/META.camlimages
+	# Remove the rpath
+	chrpath -d $(DESTDIR)/$(OCAMLIBDIR)/stublibs/*.so
 
-# binary-indep: build install
-# 	dh_installdocs -p libcamlimages-ocaml-doc
-# 	dh_installexamples -p libcamlimages-ocaml-doc
-
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_link -i
-
-	#	Set up documentation links
-	#	Install documentation
-
+	# Set up documentation links
+	# Install documentation
 	cp -rf doc/* \
 	 $(DESTDIR_DOC)/usr/share/doc/libcamlimages-ocaml-doc/html
 	$(RM) $(DESTDIR_DOC)/usr/share/doc/libcamlimages-ocaml-doc/html/LICENSE
@@ -92,13 +89,11 @@
 	dh_installdocs -i
 	dh_installchangelogs -i CHANGES
 	dh_installexamples -i
-
 	# remove Makefile and .depend files (because they are relative to source
 	# tree of camlimages)
 	-find \
 		debian/libcamlimages-ocaml-doc \
 		\( -name .depend -or -name Makefile \) -exec rm {} \;
-
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i


