[Pkg-ocaml-maint-commits] r1955 - in trunk/packages/camomile/trunk/debian: . patches

Sylvain LE GALL gildor-guest at costa.debian.org
Wed Nov 9 15:20:42 UTC 2005 

Author: gildor-guest
Date: 2005-11-09 15:20:40 +0000 (Wed, 09 Nov 2005)
New Revision: 1955

Removed:
   trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.dirs
   trunk/packages/camomile/trunk/debian/libcamomile-ocaml.dirs
Modified:
   trunk/packages/camomile/trunk/debian/changelog
   trunk/packages/camomile/trunk/debian/control
   trunk/packages/camomile/trunk/debian/patches/makefile.dpatch
   trunk/packages/camomile/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference, new upstream -- SLG


Modified: trunk/packages/camomile/trunk/debian/changelog
===================================================================
--- trunk/packages/camomile/trunk/debian/changelog	2005-11-09 14:53:21 UTC (rev 1954)
+++ trunk/packages/camomile/trunk/debian/changelog	2005-11-09 15:20:40 UTC (rev 1955)
@@ -1,3 +1,11 @@
+camomile (0.6.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove direct reference to ocaml library dir
+  * Upgrade standards version to 3.6.2.0 (no change)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 16:09:23 +0100
+
 camomile (0.6.1-2) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/camomile/trunk/debian/control
===================================================================
--- trunk/packages/camomile/trunk/debian/control	2005-11-09 14:53:21 UTC (rev 1954)
+++ trunk/packages/camomile/trunk/debian/control	2005-11-09 15:20:40 UTC (rev 1955)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
 Build-Depends: ocaml-nox-3.08.3, debhelper (>= 4), dpatch (>=1.11), ocaml-findlib
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.0
 
 Package: libcamomile-ocaml-data
 Section: libdevel

Deleted: trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.dirs
===================================================================
--- trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.dirs	2005-11-09 14:53:21 UTC (rev 1954)
+++ trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.dirs	2005-11-09 15:20:40 UTC (rev 1955)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3

Deleted: trunk/packages/camomile/trunk/debian/libcamomile-ocaml.dirs
===================================================================
--- trunk/packages/camomile/trunk/debian/libcamomile-ocaml.dirs	2005-11-09 14:53:21 UTC (rev 1954)
+++ trunk/packages/camomile/trunk/debian/libcamomile-ocaml.dirs	2005-11-09 15:20:40 UTC (rev 1955)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs/

Modified: trunk/packages/camomile/trunk/debian/patches/makefile.dpatch
===================================================================
--- trunk/packages/camomile/trunk/debian/patches/makefile.dpatch	2005-11-09 14:53:21 UTC (rev 1954)
+++ trunk/packages/camomile/trunk/debian/patches/makefile.dpatch	2005-11-09 15:20:40 UTC (rev 1955)
@@ -23,13 +23,13 @@
 exit 0
 
 @DPATCH@
-diff -urNad camomile-0.6.1/Makefile.in /tmp/dpep.Tcnd5U/camomile-0.6.1/Makefile.in
---- camomile-0.6.1/Makefile.in	2004-12-03 01:51:13.000000000 +0100
-+++ /tmp/dpep.Tcnd5U/camomile-0.6.1/Makefile.in	2004-12-03 02:02:04.000000000 +0100
-@@ -404,7 +404,7 @@
- 	 then files="libcamomileunpack.a $$files"; fi &&\
- 	if [ -f dllcamomileunpack.so ];\
- 	 then files="dllcamomileunpack.so $$files"; fi &&\
+diff -urNad camomile-0.6.3~/Makefile.in camomile-0.6.3/Makefile.in
+--- camomile-0.6.3~/Makefile.in	2005-11-09 16:15:08.000000000 +0100
++++ camomile-0.6.3/Makefile.in	2005-11-09 16:18:37.000000000 +0100
+@@ -382,7 +382,7 @@
+ 	if [ -f camomile.cma ]; then files="camomile.* $$files"; fi&&\
+ 	if [ -f libcamomile.a ]; then files="libcamomile.a $$files"; fi &&\
+ 	if [ -f dllcamomile.so ]; then files="dllcamomile.so $$files"; fi &&\
 -	ocamlfind install camomile $(INT) $$files META $(INT:cmi=mli)
 +	ocamlfind install $(DESTDIR) camomile $(INT) $$files META $(INT:cmi=mli)
  

Modified: trunk/packages/camomile/trunk/debian/rules
===================================================================
--- trunk/packages/camomile/trunk/debian/rules	2005-11-09 14:53:21 UTC (rev 1954)
+++ trunk/packages/camomile/trunk/debian/rules	2005-11-09 15:20:40 UTC (rev 1955)
@@ -2,11 +2,11 @@
 
 include /usr/share/dpatch/dpatch.make 
 
-OCAML_VERSION=3.08.3
-OCAML_LIBDIR=`ocamlc -where`
+OCAMLIBDIR=`ocamlc -where`
 PACKAGE_DEV=libcamomile-ocaml-dev
-PACKAGE_DEV_COMMON=libcamomile-ocaml-data
-PACKAGE=camomile
+DESTDIR_DEV=$(CURDIR)/debian/$(PACKAGE_DEV)
+PACKAGE_COMMON=libcamomile-ocaml-data
+DESTDIR_COMMON=$(CURDIR)/debian/$(PACKAGE_COMMON)
 
 config: config-stamp
 config-stamp:
@@ -17,7 +17,6 @@
 build-arch: build-arch-stamp
 build-arch-stamp: config-stamp
 	dh_testdir
-	#cp /usr/share/perl/$(PERL_VERSION)/unicore/UnicodeData.txt $(CURDIR)/unidata/UnicodeData.txt
 	$(MAKE)
 	touch build-arch-stamp
 
@@ -50,13 +49,14 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
 	$(MAKE) install \
-	 DESTDIR="-ldconf ignore -destdir $(CURDIR)/debian/$(PACKAGE_DEV)/usr/lib/ocaml/$(OCAML_VERSION)" \
-	 DATADIR="$(CURDIR)/debian/$(PACKAGE_DEV_COMMON)/usr/share"
-	cp -R dochtml $(CURDIR)/debian/$(PACKAGE_DEV_COMMON)/usr/share/doc/$(PACKAGE_DEV_COMMON)/html
-	cp unidata/UnicodeData.html $(CURDIR)/debian/$(PACKAGE_DEV_COMMON)/usr/share/doc/$(PACKAGE_DEV_COMMON)/
-	cp unidata/README           $(CURDIR)/debian/$(PACKAGE_DEV_COMMON)/usr/share/doc/$(PACKAGE_DEV_COMMON)/README.unidata
-	cp unidata/tr10/README      $(CURDIR)/debian/$(PACKAGE_DEV_COMMON)/usr/share/doc/$(PACKAGE_DEV_COMMON)/README.unidata.tr10
+	 DESTDIR="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAMLIBDIR)" \
+	 DATADIR="$(DESTDIR_COMMON)/usr/share"
+	cp -R dochtml               $(DESTDIR_COMMON)/usr/share/doc/$(PACKAGE_COMMON)/html
+	cp unidata/UnicodeData.html $(DESTDIR_COMMON)/usr/share/doc/$(PACKAGE_COMMON)/
+	cp unidata/README           $(DESTDIR_COMMON)/usr/share/doc/$(PACKAGE_COMMON)/README.unidata
+	cp unidata/tr10/README      $(DESTDIR_COMMON)/usr/share/doc/$(PACKAGE_COMMON)/README.unidata.tr10
 
 binary-indep: build install
 	dh_testdir -i

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