[Pkg-ocaml-maint-commits] [SCM] ocaml-dbus packaging branch, master, updated. debian/0.07-1-1-g63f6a35
Sylvain Le Gall
gildor at debian.org
Sat Mar 7 00:31:25 UTC 2009
The following commit has been merged in the master branch:
commit 07c60a3cca183cf6e90bc967b1f69cb49adfd81f
Author: Sylvain Le Gall <gildor at debian.org>
Date: Sat Mar 7 01:30:16 2009 +0100
New Upstream Version, migration to ocaml 3.11 and updated copyright file format
* New Upstream Version
* Set maintainer to Debian OCaml Maintainers
* Add dh-ocaml build-dependency (rules/ocaml.mk)
* Upgrade Standards-Version to 3.8.0 (debian/README.source)
* Add ${misc:Depends} to dependencies
* Update debian/copyright file to use
http://wiki.debian.org/Proposals/CopyrightFormat
* Patch 01_destdir applied upstream, remove it
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..62605d2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package use dpatch for patching the source.
+
+Please consider reading dpatch manpage to patch the source.
+
+ -- Sylvain Le Gall <gildor at debian.org> Sun, 22 Jun 2008 23:26:52 +0200
diff --git a/debian/changelog b/debian/changelog
index d52edcc..be98004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-ocaml-dbus (0.06-2) UNRELEASED; urgency=low
+ocaml-dbus (0.07-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New Upstream Version
+ * Set maintainer to Debian OCaml Maintainers
+ * Add dh-ocaml build-dependency (rules/ocaml.mk)
+ * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+ * Add ${misc:Depends} to dependencies
+ * Update debian/copyright file to use
+ http://wiki.debian.org/Proposals/CopyrightFormat
+ * Patch 01_destdir applied upstream, remove it
- -- Sylvain Le Gall <gildor at debian.org> Mon, 09 Jun 2008 00:50:44 +0200
+ -- Sylvain Le Gall <gildor at debian.org> Sat, 07 Mar 2009 01:19:34 +0100
ocaml-dbus (0.06-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2e05007..2353343 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,24 @@
Source: ocaml-dbus
Section: libdevel
Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.52), ocaml-nox (>= 3.10.1), debhelper (>> 5), ocaml-findlib, dpatch, libdbus-1-dev, pkg-config
-Standards-Version: 3.7.3
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.52),
+ ocaml-nox (>= 3.10.1),
+ debhelper (>> 5),
+ ocaml-findlib,
+ dpatch,
+ libdbus-1-dev,
+ pkg-config,
+ dh-ocaml (>= 0.4.1)
+Standards-Version: 3.8.0
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-dbus.git
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-dbus.git
Homepage: http://tab.snarc.org/projects/ocaml_dbus/
Package: libdbus-ocaml
Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml bindings for the D-Bus API
This library provides OCaml bindings for using D-Bus.
.
@@ -21,7 +29,7 @@ Description: OCaml bindings for the D-Bus API
Package: libdbus-ocaml-dev
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libdbus-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libdbus-ocaml (= ${binary:Version}), ${misc:Depends}
Description: OCaml bindings for the D-Bus API
This library provides OCaml bindings for using D-Bus.
.
diff --git a/debian/copyright b/debian/copyright
index 3763779..4ff48d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,12 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Sun, 08 Jun 2008 23:04:19 +0200
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Vincent Hanquez
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Sun, 08 Jun 2008 23:04:19 +0200
+Original-Source-Location: http://tab.snarc.org/projects/ocaml_dbus/
-It was downloaded from :
-
-http://tab.snarc.org/projects/ocaml_dbus/
-
-Copyright:
-
- Copyright (C) 2006 Vincent Hanquez
-
-License:
+Files: *
+Copyright: (C) 2006 Vincent Hanquez
+License: LGPL-2.1
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
@@ -23,3 +20,6 @@ License:
On Debian GNU/Linux systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+Files: debian/*
+Copyright: (C) 2008-2009 Sylvain Le Gall
+License: GPL-2+
diff --git a/debian/patches/00list b/debian/patches/00list
index 203cf3e..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +0,0 @@
-01_makefile
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
deleted file mode 100755
index 8c8badb..0000000
--- a/debian/patches/01_makefile.dpatch
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use ocamlc to compile C files and pass only DBUS flags through -ccopt,
-## DP: add {all|install}-{opt|byte} targets, fix ocamlmklib invocation.
-
- at DPATCH@
-diff -urNad ocaml-dbus~/Makefile ocaml-dbus/Makefile
---- ocaml-dbus~/Makefile 2008-06-09 00:38:33.000000000 +0200
-+++ ocaml-dbus/Makefile 2008-06-09 00:39:50.000000000 +0200
-@@ -1,9 +1,8 @@
--CC = gcc
--CFLAGS = -Wall -fPIC -O2 `pkg-config --cflags dbus-1` -I$(OCAMLLIBDIR)
-+DBUSFLAGS = -ccopt "$(shell pkg-config --cflags dbus-1)"
- OCAMLC = ocamlc
- OCAMLOPT = ocamlopt
-
--LDFLAGS = -cclib -L./
-+DBUSLDFLAGS = -cclib "$(filter-out -l%,$(shell pkg-config --libs dbus-1))" $(filter -l%,$(shell pkg-config --libs dbus-1))
-
- OCAMLOPTFLAGS =
- OCAML_PKG_NAME = dbus
-@@ -19,10 +18,15 @@
-
- INTERFACES = dBus.cmi dBus.mli
- LIBS = dBus.cmxa dBus.cma
-+LIBS_BYTE = $(filter-out %.cmxa,$(LIBS))
- PROGRAMS = test
-
- all: $(INTERFACES) $(LIBS) $(PROGRAMS)
-
-+all-opt: all
-+
-+all-byte: $(INTERFACES) $(LIBS_BYTE)
-+
- bins: $(PROGRAMS)
-
- libs: $(LIBS)
-@@ -31,14 +35,12 @@
- $(OCAMLOPT) $(OCAMLOPTFLAGS) -a -cclib -ldbus_stubs -cclib -ldbus-1 -o $@ dBus.cmx
-
- dBus.cma: libdbus_stubs.a dBus.cmi dBus.cmo
-- $(OCAMLC) -a -dllib dlldbus_stubs.so -cclib -ldbus_stubs -cclib -ldbus-1 -o $@ -custom dBus.cmo
-+ $(OCAMLC) -a -dllib dlldbus_stubs.so -cclib -ldbus_stubs -cclib -ldbus-1 -o $@ dBus.cmo
-
--dbus_stubs.a: dbus_stubs.o
-- ocamlmklib -o dbus_stubs $+
-+dbus_stubs.a: libdbus_stubs.a
-
- libdbus_stubs.a: dbus_stubs.o
-- ar rcs $@ $+
-- ocamlmklib -o dbus_stubs $+
-+ ocamlmklib -o dbus_stubs $(DBUSLDFLAGS) $+
-
- %.cmo: %.ml
- $(OCAMLC) -c -o $@ $<
-@@ -50,7 +52,7 @@
- $(OCAMLOPT) $(OCAMLOPTFLAGS) -c -o $@ $<
-
- %.o: %.c
-- $(CC) $(CFLAGS) -c -o $@ $<
-+ $(OCAMLC) $(DBUSFLAGS) -c -o $@ $<
-
- .PHONY: check
- check:
-@@ -62,11 +64,16 @@
- install: $(LIBS)
- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore $(OCAML_PKG_NAME) META $(INTERFACES) $(LIBS) *.a *.so *.cmx
-
-+install-opt: install
-+
-+install-byte: all-byte
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore $(OCAML_PKG_NAME) META $(INTERFACES) $(LIBS_BYTE) *.a *.so
-+
- uninstall:
- ocamlfind remove -destdir $(OCAMLDESTDIR) $(OCAML_PKG_NAME)
-
--test: dBus.cmxa test.ml
-- $(OCAMLOPT) -o $@ $(LDFLAGS) unix.cmxa $+
-+test: dBus.cma test.ml
-+ $(OCAMLC) -o $@ unix.cma $+
-
- clean:
- rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa $(LIBS) $(PROGRAMS)
diff --git a/debian/rules b/debian/rules
index 59f0b48..229bbe6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# debian/rules for ocaml-dbus package
-# Copyright (C) 2008 Sylvain Le Gall <gildor at debian.org>
+# Copyright (C) 2008-2009 Sylvain Le Gall <gildor at debian.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -20,7 +20,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
DESTDIR_DEV=$(CURDIR)/debian/libdbus-ocaml-dev
DESTDIR=$(CURDIR)/debian/libdbus-ocaml
@@ -37,9 +37,5 @@ DEB_MAKE_INSTALL_TARGET += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
OCAML_OCAMLDOC_PACKAGES = libdbus-ocaml-dev
-clean::
- -$(RM) '$(CURDIR)/debian/libdbus-ocaml-dev.dirs'
- -$(RM) '$(CURDIR)/debian/libdbus-ocaml.dirs'
-
install/libdbus-ocaml-dev::
- mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/dbus/*.so $(DESTDIR)/$(OCAML_DLL_DIR)/
+ mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/dbus/*.so '$(DESTDIR)/$(OCAML_DLL_DIR)/'
--
ocaml-dbus packaging
More information about the Pkg-ocaml-maint-commits
mailing list