[Pkg-ocaml-maint-commits] r5504 - in /trunk/packages/ocaml-csv/trunk/debian: changelog control patches/01_Makefile_extlib.dpatch
Author: glondu-guest Date: Wed Apr 16 07:37:35 2008 New Revision: 5504 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5504 Log: * Install csv.cmx if available. * Added DM-Upload-Allowed to debian/control. Modified: trunk/packages/ocaml-csv/trunk/debian/changelog trunk/packages/ocaml-csv/trunk/debian/control trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch Modified: trunk/packages/ocaml-csv/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/changelog?rev=5504op=diff == --- trunk/packages/ocaml-csv/trunk/debian/changelog (original) +++ trunk/packages/ocaml-csv/trunk/debian/changelog Wed Apr 16 07:37:35 2008 @@ -1,3 +1,10 @@ +ocaml-csv (1.1.6-4) UNRELEASED; urgency=low + + * Install csv.cmx if available. + * Added DM-Upload-Allowed to debian/control. + + -- Stephane Glondu [EMAIL PROTECTED] Wed, 16 Apr 2008 09:35:15 +0200 + ocaml-csv (1.1.6-3) unstable; urgency=low * Fix 01_Makefile_extlib.dpatch to handle architectures where Modified: trunk/packages/ocaml-csv/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/control?rev=5504op=diff == --- trunk/packages/ocaml-csv/trunk/debian/control (original) +++ trunk/packages/ocaml-csv/trunk/debian/control Wed Apr 16 07:37:35 2008 @@ -2,6 +2,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Stephane Glondu [EMAIL PROTECTED] +DM-Upload-Allowed: yes Build-Depends: debhelper (= 5), dpatch, ocaml-nox, ocaml-findlib, libextlib-ocaml-dev, xsltproc, docbook-xsl Standards-Version: 3.7.3 Section: libs Modified: trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch?rev=5504op=diff == --- trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch (original) +++ trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch Wed Apr 16 07:37:35 2008 @@ -13,7 +13,7 @@ # of file csv.ml. +PREFIX:= /usr/local -+NATIVELIBS:= $(if $(wildcard *.cmxa),csv.cmxa csv.a) ++NATIVELIBS:= $(if $(wildcard *.cmxa),csv.cmxa csv.a csv.cmx) +OCAMLLIBDIR := $(shell ocamlc -where) OCAMLCINCS:= #OCAMLCINCS := -package extlib ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5505 - in /trunk/packages/ocaml-mad: ./ trunk/debian/changelog trunk/debian/control upstream/ocaml-mad_0.3.2.orig.tar.gz upstream/ocaml-mad_0.3.3.orig.tar.gz
Author: toots Date: Wed Apr 16 13:30:13 2008 New Revision: 5505 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5505 Log: Prepared ocaml-mad 0.3.3-1 Added: trunk/packages/ocaml-mad/upstream/ocaml-mad_0.3.3.orig.tar.gz (with props) Removed: trunk/packages/ocaml-mad/upstream/ocaml-mad_0.3.2.orig.tar.gz Modified: trunk/packages/ocaml-mad/ (props changed) trunk/packages/ocaml-mad/trunk/debian/changelog trunk/packages/ocaml-mad/trunk/debian/control Propchange: trunk/packages/ocaml-mad/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 16 13:30:13 2008 @@ -1,0 +1,1 @@ +build-area Modified: trunk/packages/ocaml-mad/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/changelog?rev=5505op=diff == --- trunk/packages/ocaml-mad/trunk/debian/changelog (original) +++ trunk/packages/ocaml-mad/trunk/debian/changelog Wed Apr 16 13:30:13 2008 @@ -1,9 +1,14 @@ -ocaml-mad (0.3.2-5) UNRELEASED; urgency=low +ocaml-mad (0.3.3-1) unstable; urgency=low + [ Julien Cristau ] * Fix FTBFS with new dpkg-dev by setting CFLAGS correctly in debian/rules (closes: 476038). - -- Julien Cristau [EMAIL PROTECTED] Mon, 14 Apr 2008 14:01:21 +0200 + [ Romain Beauxis ] + * New upstream release, now installs .cmx file + * Change maintainer to Debian OCaml Maintainers + + -- Romain Beauxis [EMAIL PROTECTED] Wed, 16 Apr 2008 14:26:22 +0100 ocaml-mad (0.3.2-4) unstable; urgency=high Modified: trunk/packages/ocaml-mad/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/control?rev=5505op=diff == --- trunk/packages/ocaml-mad/trunk/debian/control (original) +++ trunk/packages/ocaml-mad/trunk/debian/control Wed Apr 16 13:30:13 2008 @@ -1,7 +1,7 @@ Source: ocaml-mad Section: devel Priority: optional -Maintainer:Liquidsoap Debian Packaging [EMAIL PROTECTED] +Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Romain Beauxis [EMAIL PROTECTED], Samuel Mimram [EMAIL PROTECTED] Build-Depends: debhelper ( 4.0.0), dpkg-dev (= 1.13.19), libmad0-dev, ocaml-nox (= 3.10), ocaml-findlib, pkg-config Standards-Version: 3.7.3 Added: trunk/packages/ocaml-mad/upstream/ocaml-mad_0.3.3.orig.tar.gz URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/upstream/ocaml-mad_0.3.3.orig.tar.gz?rev=5505op=file == Binary file - no diff available. Propchange: trunk/packages/ocaml-mad/upstream/ocaml-mad_0.3.3.orig.tar.gz -- svn:mime-type = application/octet-stream ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5506 - /tags/packages/ocaml-mad/0.3.3-1/
Author: toots Date: Wed Apr 16 13:31:56 2008 New Revision: 5506 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5506 Log: [svn-buildpackage] Tagging ocaml-mad (0.3.3-1) Added: tags/packages/ocaml-mad/0.3.3-1/ - copied from r5505, trunk/packages/ocaml-mad/trunk/ ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5507 - in /trunk/packages/ocaml-ogg: ./ tarballs/ocaml-ogg_0.1.1.orig.tar.gz tarballs/ocaml-ogg_0.2.0.orig.tar.gz trunk/debian/changelog trunk/debian/control trunk/debian/ru
Author: toots Date: Wed Apr 16 15:19:18 2008 New Revision: 5507 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5507 Log: Prepared ocaml-ogg 0.2.0-1 Added: trunk/packages/ocaml-ogg/tarballs/ocaml-ogg_0.2.0.orig.tar.gz (with props) Removed: trunk/packages/ocaml-ogg/tarballs/ocaml-ogg_0.1.1.orig.tar.gz Modified: trunk/packages/ocaml-ogg/ (props changed) trunk/packages/ocaml-ogg/trunk/debian/changelog trunk/packages/ocaml-ogg/trunk/debian/control trunk/packages/ocaml-ogg/trunk/debian/rules Propchange: trunk/packages/ocaml-ogg/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 16 15:19:18 2008 @@ -1,0 +1,1 @@ +build-area Added: trunk/packages/ocaml-ogg/tarballs/ocaml-ogg_0.2.0.orig.tar.gz URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/tarballs/ocaml-ogg_0.2.0.orig.tar.gz?rev=5507op=file == Binary file - no diff available. Propchange: trunk/packages/ocaml-ogg/tarballs/ocaml-ogg_0.2.0.orig.tar.gz -- svn:mime-type = application/octet-stream Modified: trunk/packages/ocaml-ogg/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/changelog?rev=5507op=diff == --- trunk/packages/ocaml-ogg/trunk/debian/changelog (original) +++ trunk/packages/ocaml-ogg/trunk/debian/changelog Wed Apr 16 15:19:18 2008 @@ -1,4 +1,4 @@ -ocaml-ogg (0.1.1-4) UNRELEASED; urgency=low +ocaml-ogg (0.2.0-1) unstable; urgency=low [ Stefano Zacchiroli ] * fix vcs-svn field to point just above the debian/ dir @@ -7,7 +7,14 @@ * Fix FTBFS with new dpkg-dev by setting CFLAGS correctly in debian/rules (closes: 476058). - -- Stefano Zacchiroli [EMAIL PROTECTED] Mon, 31 Dec 2007 16:50:11 +0100 + [ Romain Beauxis ] + * New upstream release, now installs .cmx file + * Changed maintainer to Debian OCaml Maintainers + * Updated standards to 3.7.3 + * Removed redundant and buggy make invokation with CFLAGS +in debian/rules + + -- Romain Beauxis [EMAIL PROTECTED] Wed, 16 Apr 2008 16:07:56 +0100 ocaml-ogg (0.1.1-3) unstable; urgency=low Modified: trunk/packages/ocaml-ogg/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/control?rev=5507op=diff == --- trunk/packages/ocaml-ogg/trunk/debian/control (original) +++ trunk/packages/ocaml-ogg/trunk/debian/control Wed Apr 16 15:19:18 2008 @@ -1,10 +1,10 @@ Source: ocaml-ogg Section: devel Priority: optional -Maintainer: Liquidsoap Debian Packaging [EMAIL PROTECTED] +Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Samuel Mimram [EMAIL PROTECTED], Romain Beauxis [EMAIL PROTECTED] Build-Depends: debhelper (= 5.0.0), libogg-dev, ocaml-nox (= 3.10), ocaml-findlib, pkg-config -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Homepage: http://savonet.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/ Modified: trunk/packages/ocaml-ogg/trunk/debian/rules URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/rules?rev=5507op=diff == --- trunk/packages/ocaml-ogg/trunk/debian/rules (original) +++ trunk/packages/ocaml-ogg/trunk/debian/rules Wed Apr 16 15:19:18 2008 @@ -10,7 +10,7 @@ DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where) -CFLAGS = -O2 -g -fPIC +CFLAGS = -O2 -g ocamlinit: for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in $$f; done @@ -23,7 +23,7 @@ build-stamp: config.status dh_testdir - $(MAKE) CFLAGS=$(CFLAGS) + $(MAKE) touch build-stamp ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5512 - /tags/packages/ocaml-shout/0.2.6-1/
Author: toots Date: Wed Apr 16 15:54:07 2008 New Revision: 5512 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5512 Log: [svn-buildpackage] Tagging ocaml-shout (0.2.6-1) Added: tags/packages/ocaml-shout/0.2.6-1/ - copied from r5511, trunk/packages/ocaml-shout/trunk/ ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5514 - /tags/packages/ocaml-soundtouch/0.1.2-1/
Author: toots Date: Wed Apr 16 16:03:19 2008 New Revision: 5514 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5514 Log: [svn-buildpackage] Tagging ocaml-soundtouch (0.1.2-1) Added: tags/packages/ocaml-soundtouch/0.1.2-1/ - copied from r5513, trunk/packages/ocaml-soundtouch/trunk/ ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5515 - in /trunk/packages/ocaml-taglib: tarballs/ocaml-taglib_0.1.0.orig.tar.gz tarballs/ocaml-taglib_0.1.2.orig.tar.gz trunk/debian/changelog trunk/debian/control
Author: toots Date: Wed Apr 16 16:08:08 2008 New Revision: 5515 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5515 Log: Prepared ocaml-taglib 0.1.2-1 Added: trunk/packages/ocaml-taglib/tarballs/ocaml-taglib_0.1.2.orig.tar.gz (with props) Removed: trunk/packages/ocaml-taglib/tarballs/ocaml-taglib_0.1.0.orig.tar.gz Modified: trunk/packages/ocaml-taglib/trunk/debian/changelog trunk/packages/ocaml-taglib/trunk/debian/control Added: trunk/packages/ocaml-taglib/tarballs/ocaml-taglib_0.1.2.orig.tar.gz URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/tarballs/ocaml-taglib_0.1.2.orig.tar.gz?rev=5515op=file == Binary file - no diff available. Propchange: trunk/packages/ocaml-taglib/tarballs/ocaml-taglib_0.1.2.orig.tar.gz -- svn:mime-type = application/octet-stream Modified: trunk/packages/ocaml-taglib/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/changelog?rev=5515op=diff == --- trunk/packages/ocaml-taglib/trunk/debian/changelog (original) +++ trunk/packages/ocaml-taglib/trunk/debian/changelog Wed Apr 16 16:08:08 2008 @@ -1,4 +1,4 @@ -ocaml-taglib (0.1.1-2) UNRELEASED; urgency=low +ocaml-taglib (0.1.2-1) unstable; urgency=low [ Stefano Zacchiroli ] * fix vcs-svn field to point just above the debian/ dir @@ -7,7 +7,11 @@ * Fix FTBFS with new dpkg-dev by setting CFLAGS correctly in debian/rules (closes: 476065). - -- Stefano Zacchiroli [EMAIL PROTECTED] Mon, 31 Dec 2007 16:50:14 +0100 + [ Romain Beauxis ] + * New upstream release, now installs .cmx file + * Changed maintainer to Debian OCaml Maintainers + + -- Romain Beauxis [EMAIL PROTECTED] Wed, 16 Apr 2008 17:06:54 +0100 ocaml-taglib (0.1.1-1) unstable; urgency=low Modified: trunk/packages/ocaml-taglib/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/control?rev=5515op=diff == --- trunk/packages/ocaml-taglib/trunk/debian/control (original) +++ trunk/packages/ocaml-taglib/trunk/debian/control Wed Apr 16 16:08:08 2008 @@ -1,7 +1,7 @@ Source: ocaml-taglib Section: devel Priority: optional -Maintainer: Liquidsoap Debian Packaging [EMAIL PROTECTED] +Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Samuel Mimram [EMAIL PROTECTED], Romain Beauxis [EMAIL PROTECTED] Build-Depends: debhelper (= 5.0.0), libtagc0-dev, ocaml-nox (= 3.10), ocaml-findlib, pkg-config Standards-Version: 3.7.3 ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 34228ff9e71134bf50482b4db619a8d8be775a2d
The following commit has been merged in the master branch: commit 4d7cac7d862b96de53dfc4328b5fff75375ecfa9 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Mon Apr 14 08:19:01 2008 +0200 first debian/copyright draft (to be reviewed for accuracy) diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..158ad9f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Stefano Zacchiroli [EMAIL PROTECTED] on +Thu, 10 Apr 2008 00:04:40 +0200. + +It was downloaded from http://gforge.inria.fr/projects/sodiac/ + +Files: * +Copyright: © 2004-2008 Berke Durak + © 2004-2008 Jaap Boender +License: LGPL-2 + +Files: debian/* +Copyright: © 2008 Stefano Zacchiroli [EMAIL PROTECTED] +License: GPL-3+ + -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 34228ff9e71134bf50482b4db619a8d8be775a2d
The following commit has been merged in the master branch: commit 3585e6e4930fb75848d53bf8e2d6c7b36fce2fc5 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Mon Apr 14 08:22:31 2008 +0200 dummy changelog diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..b384c6e --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +dose2 (1.2-1) UNRELEASED; urgency=low + + * Initial release (Closes: #) + + -- Stefano Zacchiroli [EMAIL PROTECTED] Thu, 10 Apr 2008 00:04:40 +0200 + -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 34228ff9e71134bf50482b4db619a8d8be775a2d
The following commit has been merged in the master branch: commit 8cab5e06fd3c0f70acbab1a5783b95673f375021 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 21:34:36 2008 +0200 better implementation of byte/opt split diff --git a/Makefile b/Makefile index dd13a23..ea97d97 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,9 @@ DO=$(MAKE) -I $(PWD)/make BASE=$(PWD) .PHONY: $(DIRS) .PHONY: dose2-util dose2-io install -all: dql +all: byte opt +byte: dql/dql.cma +opt: dql/dql.cmxa clean: @for x in $(DIRS) ; do \ @@ -55,15 +57,10 @@ $(1)/$(1).cmxa: $(foreach x,$(2),$x/$x.cmxa) $(1)/$(1).cma: $(foreach x,$(2),$x/$x.cma) $(1)/$(1).cmxa: - $(DO) -C $(1) opt + $(DO) -C $(1) opt $(1)/$(1).cma: - $(DO) -C $(1) byte - -$(1).byte: $(1)/$(1).cma -$(1).opt: $(1)/$(1).cmxa -byte: $(1).byte -opt: $(1).opt + $(DO) -C $(1) byte endef #$(foreach exec, $(EXECS), $(eval $(call EXEC_TEMPLATE,$(exec -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 34228ff9e71134bf50482b4db619a8d8be775a2d
The following commit has been merged in the master branch: commit 34228ff9e71134bf50482b4db619a8d8be775a2d Merge: 3585e6e4930fb75848d53bf8e2d6c7b36fce2fc5 8cab5e06fd3c0f70acbab1a5783b95673f375021 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 21:34:43 2008 +0200 Merge branch 'flexible-make' -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. f4d263293baabc9560a977dc7c81d598088139b6
The following commit has been merged in the master branch:
commit 0270d01bc3dc94f2c8e2f606f5f632211230f7ba
Author: Stefano Zacchiroli [EMAIL PROTECTED]
Date: Wed Apr 16 22:29:45 2008 +0200
avoid modifying system-wide ld.conf
diff --git a/make/Makefile.common b/make/Makefile.common
index 19ac256..01aadf0 100644
--- a/make/Makefile.common
+++ b/make/Makefile.common
@@ -29,7 +29,7 @@ endif
install:
{ test ! -f $(XARCHIVE) || extra1=*.cmxa *.a; }; \
{ test -z $(DESTDIR) || mkdir -p $(DESTDIR); }; \
- $(OCAMLFIND) install $(DESTFLAG) $(NAME) *.mli *.cmi *.cma META
$$extra1 $(extra2)
+ $(OCAMLFIND) install -ldconf dummy.ld.conf $(DESTFLAG) $(NAME) *.mli
*.cmi *.cma META $$extra1 $(extra2)
.PHONY: uninstall
uninstall:
@@ -42,6 +42,7 @@ clean:
@rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa
@rm -f $(EXEC) $(XEXEC)
@rm -f *.annot
+ @rm -f dummy.ld.conf
@rm -f doc/*
.PHONY: doc
--
dose2 packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. f4d263293baabc9560a977dc7c81d598088139b6
The following commit has been merged in the master branch: commit ad525c6629f5d7005813a21922bf6b4391316438 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 22:48:23 2008 +0200 install files in the appropriate packages diff --git a/debian/rules b/debian/rules index ca61561..ec0a019 100755 --- a/debian/rules +++ b/debian/rules @@ -9,4 +9,12 @@ else DEB_MAKE_BUILD_TARGET = byte endif -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp/ +LIB_NAME = dose2 +DLL_PKG_NAME = lib$(LIB_NAME)-ocaml +DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR) +install/$(DEV_PKG_NAME):: + mkdir -p debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR) + mv debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)/mmap/*.so \ + debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR) + -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. f4d263293baabc9560a977dc7c81d598088139b6
The following commit has been merged in the master branch: commit f4d263293baabc9560a977dc7c81d598088139b6 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 22:48:48 2008 +0200 fill ITP number diff --git a/debian/changelog b/debian/changelog index b384c6e..be0fbe0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dose2 (1.2-1) UNRELEASED; urgency=low - * Initial release (Closes: #) + * Initial release (Closes: #476465) -- Stefano Zacchiroli [EMAIL PROTECTED] Thu, 10 Apr 2008 00:04:40 +0200 -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. abc41d28c151a7c649307828452a7424d4f1e202
The following commit has been merged in the master branch: commit 274c9f2dd398945ab4903f814ee4141beb11dc3a Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 22:51:24 2008 +0200 clean *.so files diff --git a/make/Makefile.common b/make/Makefile.common index 19ac256..319799e 100644 --- a/make/Makefile.common +++ b/make/Makefile.common @@ -39,7 +39,7 @@ uninstall: clean: @echo CLN @rm -f *.mld - @rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa + @rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *.so @rm -f $(EXEC) $(XEXEC) @rm -f *.annot @rm -f doc/* -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. abc41d28c151a7c649307828452a7424d4f1e202
The following commit has been merged in the master branch:
commit abc41d28c151a7c649307828452a7424d4f1e202
Merge: f4d263293baabc9560a977dc7c81d598088139b6
274c9f2dd398945ab4903f814ee4141beb11dc3a
Author: Stefano Zacchiroli [EMAIL PROTECTED]
Date: Wed Apr 16 22:51:35 2008 +0200
Merge branch 'flexible-make'
diff --combined make/Makefile.common
index 01aadf0,319799e..4e58c36
--- a/make/Makefile.common
+++ b/make/Makefile.common
@@@ -29,7 -29,7 +29,7 @@@ endi
install:
{ test ! -f $(XARCHIVE) || extra1=*.cmxa *.a; }; \
{ test -z $(DESTDIR) || mkdir -p $(DESTDIR); }; \
- $(OCAMLFIND) install $(DESTFLAG) $(NAME) *.mli *.cmi *.cma META
$$extra1 $(extra2)
+ $(OCAMLFIND) install -ldconf dummy.ld.conf $(DESTFLAG) $(NAME) *.mli
*.cmi *.cma META $$extra1 $(extra2)
.PHONY: uninstall
uninstall:
@@@ -39,10 -39,9 +39,10 @@@
clean:
@echo CLN
@rm -f *.mld
- @rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa
+ @rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *.so
@rm -f $(EXEC) $(XEXEC)
@rm -f *.annot
+ @rm -f dummy.ld.conf
@rm -f doc/*
.PHONY: doc
--
dose2 packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 5e4f613fce3e971ecba324fe442457f2427eebca
The following commit has been merged in the master branch: commit ecaecf786a05931655b0a685df9a3c885811dc51 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 22:58:28 2008 +0200 point to licenses file on debian systems diff --git a/debian/copyright b/debian/copyright index 158ad9f..eb27d75 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,16 @@ Copyright: © 2004-2008 Berke Durak © 2004-2008 Jaap Boender License: LGPL-2 + Dose2 is released under the GNU General Public License version 2. + + On Debian systems, the complete text of the GNU Lesser General Public License + version 2 can be found in `/usr/share/common-licenses/LGPL-2'. + Files: debian/* Copyright: © 2008 Stefano Zacchiroli [EMAIL PROTECTED] License: GPL-3+ + The Debian packaging is copyright Stefano Zacchiroli, and licensed under the + GNU General Public License, see `/usr/share/common-licenses/GPL' for the full + text. + -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 5e4f613fce3e971ecba324fe442457f2427eebca
The following commit has been merged in the master branch:
commit 5e4f613fce3e971ecba324fe442457f2427eebca
Author: Stefano Zacchiroli [EMAIL PROTECTED]
Date: Wed Apr 16 22:58:54 2008 +0200
cleaner why of avoiding ld.conf fiddling
diff --git a/make/Makefile.common b/make/Makefile.common
index 4e58c36..f37c4af 100644
--- a/make/Makefile.common
+++ b/make/Makefile.common
@@ -29,7 +29,7 @@ endif
install:
{ test ! -f $(XARCHIVE) || extra1=*.cmxa *.a; }; \
{ test -z $(DESTDIR) || mkdir -p $(DESTDIR); }; \
- $(OCAMLFIND) install -ldconf dummy.ld.conf $(DESTFLAG) $(NAME) *.mli
*.cmi *.cma META $$extra1 $(extra2)
+ $(OCAMLFIND) install -ldconf ignore $(DESTFLAG) $(NAME) *.mli *.cmi
*.cma META $$extra1 $(extra2)
.PHONY: uninstall
uninstall:
--
dose2 packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 75ebf1280a61a0f9050fcbf5f77c3c55136b11e8
The following commit has been merged in the master branch: commit 0bc5735ace7795f35f9bdfdcf8fb0721bb981db7 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 23:07:47 2008 +0200 releasing (to experimental) diff --git a/debian/changelog b/debian/changelog index be0fbe0..165d2be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -dose2 (1.2-1) UNRELEASED; urgency=low +dose2 (1.2-1) experimental; urgency=low * Initial release (Closes: #476465) - -- Stefano Zacchiroli [EMAIL PROTECTED] Thu, 10 Apr 2008 00:04:40 +0200 - + -- Stefano Zacchiroli [EMAIL PROTECTED] Wed, 16 Apr 2008 23:07:11 +0200 -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. 75ebf1280a61a0f9050fcbf5f77c3c55136b11e8
The following commit has been merged in the master branch: commit 75ebf1280a61a0f9050fcbf5f77c3c55136b11e8 Author: Stefano Zacchiroli [EMAIL PROTECTED] Date: Wed Apr 16 23:10:43 2008 +0200 fix typo in licensing declaration diff --git a/debian/copyright b/debian/copyright index eb27d75..0b65284 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ Copyright: © 2004-2008 Berke Durak © 2004-2008 Jaap Boender License: LGPL-2 - Dose2 is released under the GNU General Public License version 2. + Dose2 is released under the GNU General Lesser Public License version 2. On Debian systems, the complete text of the GNU Lesser General Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. -- dose2 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5520 - in /trunk/projects/approx/trunk: _tags control_file.ml debian/NEWS debian/changelog ifaddr.c interface.mli myocamlbuild.ml netstubs.c network.mli server.ml tcp_wrappe
Author: ecc-guest
Date: Thu Apr 17 02:31:30 2008
New Revision: 5520
URL: http://svn.debian.org/wsvn/?sc=1rev=5520
Log:
listen on both IPv4 and IPv6 sockets when available
add C stub for setsockopt IPV6_V6ONLY
build all bytecode executables with -custom
Added:
trunk/projects/approx/trunk/netstubs.c
- copied, changed from r5317, trunk/projects/approx/trunk/ifaddr.c
trunk/projects/approx/trunk/network.mli
- copied, changed from r5317, trunk/projects/approx/trunk/interface.mli
Removed:
trunk/projects/approx/trunk/ifaddr.c
trunk/projects/approx/trunk/interface.mli
Modified:
trunk/projects/approx/trunk/_tags
trunk/projects/approx/trunk/control_file.ml
trunk/projects/approx/trunk/debian/NEWS
trunk/projects/approx/trunk/debian/changelog
trunk/projects/approx/trunk/myocamlbuild.ml
trunk/projects/approx/trunk/server.ml
trunk/projects/approx/trunk/tcp_wrappers.ml
trunk/projects/approx/trunk/tests/_tags
trunk/projects/approx/trunk/tests/ifaddr_test.ml
Modified: trunk/projects/approx/trunk/_tags
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/_tags?rev=5520op=diff
==
--- trunk/projects/approx/trunk/_tags (original)
+++ trunk/projects/approx/trunk/_tags Thu Apr 17 02:31:30 2008
@@ -15,4 +15,4 @@
**/*.{byte,native}: use_unix, use_pcre, use_sha
*.{byte,native}: use_syslog, use_netsys, use_netstring
approx.{byte,native}: use_netcgi, use_nethttpd-for-netcgi2
-approx.{byte,native}: ifaddr, libwrap
+approx.{byte,native}: netstubs, libwrap
Modified: trunk/projects/approx/trunk/control_file.ml
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/control_file.ml?rev=5520op=diff
==
--- trunk/projects/approx/trunk/control_file.ml (original)
+++ trunk/projects/approx/trunk/control_file.ml Thu Apr 17 02:31:30 2008
@@ -5,7 +5,6 @@
open Printf
open Util
open Log
-open Config
type paragraph = (string * string) list
Modified: trunk/projects/approx/trunk/debian/NEWS
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/NEWS?rev=5520op=diff
==
--- trunk/projects/approx/trunk/debian/NEWS (original)
+++ trunk/projects/approx/trunk/debian/NEWS Thu Apr 17 02:31:30 2008
@@ -1,3 +1,9 @@
+approx (3.2.0) unstable; urgency=low
+
+ If both IPv4 and IPv6 sockets are supported, approx will listen on both.
+
+ -- Eric Cooper [EMAIL PROTECTED] Wed, 16 Apr 2008 21:49:01 -0400
+
approx (3.1.0~rc1) experimental; urgency=low
TCP wrappers support has been added. Access control rules can be specified
Modified: trunk/projects/approx/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/changelog?rev=5520op=diff
==
--- trunk/projects/approx/trunk/debian/changelog (original)
+++ trunk/projects/approx/trunk/debian/changelog Thu Apr 17 02:31:30 2008
@@ -1,3 +1,14 @@
+approx (3.2.0) unstable; urgency=low
+
+ * Listen on both IPv4 and IPv6 sockets when available
+ * Add setsockopt IPV6_V6ONLY to allow both kinds of sockets to bind
+to the same port, as suggested by Julien Cristau [EMAIL PROTECTED]
+ * Enable -custom for all bytecode executables, not just ones that
+directly use C stubs, to avoid missing DLLs from libpcre-ocaml, etc.
+at runtime (closes: #476367)
+
+ -- Eric Cooper [EMAIL PROTECTED] Wed, 16 Apr 2008 21:49:01 -0400
+
approx (3.1.0) unstable; urgency=low
* Prevent dh_strip from stripping custom bytecode executables
Modified: trunk/projects/approx/trunk/myocamlbuild.ml
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/myocamlbuild.ml?rev=5520op=diff
==
--- trunk/projects/approx/trunk/myocamlbuild.ml (original)
+++ trunk/projects/approx/trunk/myocamlbuild.ml Thu Apr 17 02:31:30 2008
@@ -8,29 +8,28 @@
let libraries =
[pcre; sha; syslog;
- netsys; netstring; +netcgi2:netcgi; nethttpd-for-netcgi2]
+ netsys; netstring; netcgi2:netcgi; nethttpd-for-netcgi2]
let split str =
let i = String.index str ':' in
String.sub str 0 i, String.sub str (i+1) (String.length str - (i+1))
let add_library lib =
- let dir, lib =
-if lib.[0] = '+' then split lib
-else + ^ lib, lib
+ let inc, lib =
+if String.contains lib ':' then split lib
+else lib, lib
in
- ocaml_lib ~extern: true ~dir lib
+ ocaml_lib ~extern: true ~dir: (+ ^ inc) lib
let custom_rules () =
rule Use mkversion to generate version.ml
~dep: debian/changelog ~prod: version.ml
(fun _ _ - Cmd (S [P (concat pwd mkversion); Sh version.ml]));
dep [compile; ocaml; file:log.ml] [version.ml];
- dep [link; ocaml; ifaddr] [ifaddr.o];
- flag [link; ocaml; byte; ifaddr] A -custom;
+ dep
