[Pkg-ocaml-maint-commits] r4615 - in /trunk/packages/ocaml-syck/trunk: ./ debian/ yaml/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sun Oct 14 17:04:10 UTC 2007
Author: zack
Date: Sun Oct 14 17:04:10 2007
New Revision: 4615
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4615
Log:
draft packaging now working
Added:
trunk/packages/ocaml-syck/trunk/META.in
trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.dirs.in
trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.install.in
trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.dirs.in
trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.install.in
trunk/packages/ocaml-syck/trunk/dllyaml.so.owner
trunk/packages/ocaml-syck/trunk/yaml/
trunk/packages/ocaml-syck/trunk/yaml/Makefile
Modified:
trunk/packages/ocaml-syck/trunk/Makefile
trunk/packages/ocaml-syck/trunk/debian/ (props changed)
trunk/packages/ocaml-syck/trunk/debian/changelog
trunk/packages/ocaml-syck/trunk/debian/rules
trunk/packages/ocaml-syck/trunk/debian/svn-deblayout
Added: trunk/packages/ocaml-syck/trunk/META.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/META.in?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/META.in (added)
+++ trunk/packages/ocaml-syck/trunk/META.in Sun Oct 14 17:04:10 2007
@@ -1,0 +1,4 @@
+version="@VERSION@"
+description="Syck YAML parser bindings"
+archive(byte) = "yaml.cma"
+archive(native) = "yaml.cmxa"
Modified: trunk/packages/ocaml-syck/trunk/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/Makefile?rev=4615&op=diff
==============================================================================
--- trunk/packages/ocaml-syck/trunk/Makefile (original)
+++ trunk/packages/ocaml-syck/trunk/Makefile Sun Oct 14 17:04:10 2007
@@ -1,64 +1,16 @@
-NAME = yaml
+# Debian-specific Makefile, see debian/copyright for licensing info
+# Copyright (C): 2007, Stefano Zacchiroli <zack at debian.org>
-OCAMLC = ocamlc
-ifneq ($(shell which ocamlopt),)
-OCAMLOPT = ocamlopt
-else
-OCAMLOPT = false
-endif
-OCAMLMKLIB = ocamlmklib
-OCAMLLIBDIR := $(shell $(OCAMLC) -where)
-OCAMLSTUBLIBDIR = $(OCAMLLIBDIR)/stublibs
-
-NULL =
DESTDIR =
-CMOS = \
- yamlNode.cmo \
- yamlParser.cmo \
- $(NULL)
-OS = \
- parser.o \
- $(NULL)
-CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+all: META
+ $(MAKE) -C yaml/ all
+install:
+ $(MAKE) -C yaml/ install DESTDIR=$(DESTDIR)
+clean:
+ rm -f META
+ $(MAKE) -C yaml/ clean
+META: META.in
+ sed s/@VERSION@/$$DEB_UPSTREAM_VERSION/ < $< > $@
-ifeq ($(OCAMLOPT),false)
-all: $(NAME).cma
-else
-all: $(NAME).cmxa
-endif
-
-DLLSTUFF = dll$(NAME).so
-INSTSTUFF = \
- lib$(NAME).a \
- $(NAME).cma \
- $(NULL)
-ifneq ($(OCAMLOPT),false)
-INSTSTUFF += $(NAME).cmxa
-endif
-
-install:
- install -m 644 $(DLLSTUFF) $(DESTDIR)$(OCAMLSTUBLIBDIR)/
- install -m 644 $(INSTSTUFF) $(DESTDIR)$(OCAMLLIBDIR)/yaml/
-
-clean:
- rm -f *.o *.a *.so *.cmi *.cmo *.cmx *.cma *.cmxa
-
-$(NAME).cma: $(CMOS) $(OS)
- $(OCAMLMKLIB) -o $(NAME) $^ -lsyck
-
-# also build $(NAME).cma
-$(NAME).cmxa: $(CMOS) $(OS) $(CMXS)
- $(OCAMLMKLIB) -o $(NAME) $^ -lsyck
-
-%.cmi: %.mli
- $(OCAMLC) -c $<
-%.cmo: %.ml %.cmi
- $(OCAMLC) -c $<
-%.cmx: %.ml
- $(OCAMLOPT) -c $<
-%.o: %.c
- $(OCAMLC) -c $<
-.PRECIOUS: %.cmi
-
Propchange: trunk/packages/ocaml-syck/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Modified: trunk/packages/ocaml-syck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/changelog?rev=4615&op=diff
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-syck/trunk/debian/changelog Sun Oct 14 17:04:10 2007
@@ -2,4 +2,4 @@
* first public release (Closes: ###)
- -- Stefano Zacchiroli <zack at debian.org> Fri, 12 Oct 2007 20:30:00 +0200
+ -- Stefano Zacchiroli <zack at debian.org> Sun, 14 Oct 2007 19:02:41 +0200
Added: trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.dirs.in?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.dirs.in (added)
+++ trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.dirs.in Sun Oct 14 17:04:10 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/yaml
Added: trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.install.in?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.install.in (added)
+++ trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml-dev.install.in Sun Oct 14 17:04:10 2007
@@ -1,0 +1,4 @@
+debian/tmp/*.a @OCamlStdlibDir@/yaml/
+debian/tmp/*.cm* @OCamlStdlibDir@/yaml/
+debian/tmp/*.ml* @OCamlStdlibDir@/yaml/
+debian/tmp/META @OCamlStdlibDir@/yaml/
Added: trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.dirs.in?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.dirs.in (added)
+++ trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.dirs.in Sun Oct 14 17:04:10 2007
@@ -1,0 +1,1 @@
+ at OCamlDllDir@
Added: trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.install.in?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.install.in (added)
+++ trunk/packages/ocaml-syck/trunk/debian/libsyck-ocaml.install.in Sun Oct 14 17:04:10 2007
@@ -1,0 +1,2 @@
+debian/tmp/*.so @OCamlDllDir@/
+debian/tmp/*.so.owner @OCamlDllDir@/
Modified: trunk/packages/ocaml-syck/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/rules?rev=4615&op=diff
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/rules (original)
+++ trunk/packages/ocaml-syck/trunk/debian/rules Sun Oct 14 17:04:10 2007
@@ -4,9 +4,8 @@
include /usr/share/cdbs/1/class/ocaml.mk
include /usr/share/cdbs/1/rules/dpatch.mk
-DESTDIR = $(CURDIR)/debian/tmp
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
-
+export DEB_UPSTREAM_VERSION
+DESTDIR = $(CURDIR)/debian/tmp/
DEB_MAKE_BUILD_TARGET = all
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
-
+OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
Modified: trunk/packages/ocaml-syck/trunk/debian/svn-deblayout
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/debian/svn-deblayout?rev=4615&op=diff
==============================================================================
--- trunk/packages/ocaml-syck/trunk/debian/svn-deblayout (original)
+++ trunk/packages/ocaml-syck/trunk/debian/svn-deblayout Sun Oct 14 17:04:10 2007
@@ -1,3 +1,1 @@
-origDir=../upstream
-origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pcre-ocaml/upstream
-tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/pcre-ocaml
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-syck
Added: trunk/packages/ocaml-syck/trunk/dllyaml.so.owner
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/dllyaml.so.owner?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/dllyaml.so.owner (added)
+++ trunk/packages/ocaml-syck/trunk/dllyaml.so.owner Sun Oct 14 17:04:10 2007
@@ -1,0 +1,1 @@
+yaml
Added: trunk/packages/ocaml-syck/trunk/yaml/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-syck/trunk/yaml/Makefile?rev=4615&op=file
==============================================================================
--- trunk/packages/ocaml-syck/trunk/yaml/Makefile (added)
+++ trunk/packages/ocaml-syck/trunk/yaml/Makefile Sun Oct 14 17:04:10 2007
@@ -1,0 +1,71 @@
+
+# Debian-specific Makefile, see debian/copyright for licensing info
+# Copyright (C): 2007, Stefano Zacchiroli <zack at debian.org>
+
+NAME = yaml
+
+OCAMLC = ocamlc
+ifneq ($(shell which ocamlopt),)
+OCAMLOPT = ocamlopt
+else
+OCAMLOPT = false
+endif
+OCAMLMKLIB = ocamlmklib
+
+NULL =
+DESTDIR =
+
+CMOS = \
+ yamlNode.cmo \
+ yamlParser.cmo \
+ $(NULL)
+OS = \
+ parser.o \
+ $(NULL)
+CMIS = $(patsubst %.cmo,%.cmi,$(CMOS))
+CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+MLIS = $(patsubst %.cmo,%.mli,$(CMOS))
+
+ifeq ($(OCAMLOPT),false)
+all: $(NAME).cma
+else
+all: $(NAME).cmxa
+endif
+
+DLLSTUFF = dll$(NAME).so
+INSTSTUFF = \
+ lib$(NAME).a \
+ $(NAME).cma \
+ $(CMIS) \
+ $(MLIS) \
+ ../*.so.owner \
+ ../META \
+ $(NULL)
+ifneq ($(OCAMLOPT),false)
+INSTSTUFF += $(NAME).cmxa
+endif
+
+install:
+ mkdir -p $(DESTDIR)
+ install -m 644 $(DLLSTUFF) $(INSTSTUFF) $(DESTDIR)
+
+clean:
+ rm -f *.o *.a *.so *.cmi *.cmo *.cmx *.cma *.cmxa
+
+$(NAME).cma: $(CMOS) $(OS)
+ $(OCAMLMKLIB) -o $(NAME) $^ -lsyck
+
+# also build $(NAME).cma
+$(NAME).cmxa: $(CMOS) $(OS) $(CMXS)
+ $(OCAMLMKLIB) -o $(NAME) $^ -lsyck
+
+%.cmi: %.mli
+ $(OCAMLC) -c $<
+%.cmo: %.ml %.cmi
+ $(OCAMLC) -c $<
+%.cmx: %.ml
+ $(OCAMLOPT) -c $<
+%.o: %.c
+ $(OCAMLC) -c $<
+.PRECIOUS: %.cmi
+
More information about the Pkg-ocaml-maint-commits
mailing list