[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.6-3-13-g3b5bc85
The following commit has been merged in the master branch: commit 9e89d5771182b9b8657a1ce1511ab417209efbc4 Merge: 264ccba20513096b962c74f815902b4acb232559 51d0b35f7c19412e8d96714ad377a8cef57d7870 Author: Stephane Glondu st...@glondu.net Date: Wed Jul 6 14:25:45 2011 +0200 Merge commit 'upstream/1.6.1' -- ocaml-sqlite3 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.6-3-13-g3b5bc85
The following commit has been merged in the master branch: commit 9e5d439cc29ec703542f5afbc409cbb8bf4a9188 Author: Stephane Glondu st...@glondu.net Date: Wed Jul 6 14:28:25 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 90c812c..5175cbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-sqlite3 (1.6.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 06 Jul 2011 14:28:19 +0200 + ocaml-sqlite3 (1.5.6-3) unstable; urgency=low * Add Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch -- ocaml-sqlite3 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.6-3-13-g3b5bc85
The following commit has been merged in the master branch: commit 334573515175deb26901b32d372e5049a53ea5f8 Author: Stephane Glondu st...@glondu.net Date: Wed Jul 6 14:29:54 2011 +0200 Refresh patches diff --git a/debian/patches/0001-Install-no-mktop.patch b/debian/patches/0001-Install-no-mktop.patch index a38a0c3..9c49743 100644 --- a/debian/patches/0001-Install-no-mktop.patch +++ b/debian/patches/0001-Install-no-mktop.patch @@ -1,6 +1,6 @@ From: Samuel Mimram smim...@debian.org Date: Tue, 30 Jun 2009 20:38:46 +0200 -Subject: [PATCH] Install no mktop +Subject: Install no mktop Allow installation without building in native mode diff --git a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch index 75a74d4..e67de6a 100644 --- a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch +++ b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch @@ -1,6 +1,6 @@ From: Stephane Glondu st...@glondu.net Date: Sun, 18 Oct 2009 15:27:11 +0200 -Subject: [PATCH] Do native test only if sqlite3.cmxa has been compiled +Subject: Do native test only if sqlite3.cmxa has been compiled Signed-off-by: Stephane Glondu st...@glondu.net --- @@ -22,7 +22,7 @@ index 9f0ef79..0e03f2c 100644 clean: diff --git a/test/Makefile b/test/Makefile -index 6f44141..4073644 100644 +index 8bfed3b..d379649 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,7 +5,7 @@ TESTS = $(wildcard *.ml) @@ -33,5 +33,5 @@ index 6f44141..4073644 100644 +opt: $(if $(wildcard ../sqlite3.cmxa),$(TESTS:%.ml=%.exe),) %.bc: %.ml - ocamlc -w Ae -warn-error Ae -I .. str.cma sqlite3.cma $ -o $@ + ocamlc -w Ae -warn-error Ae -I .. -dllpath .. str.cma sqlite3.cma $ -o $@ -- -- ocaml-sqlite3 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.6-3-13-g3b5bc85
The following commit has been merged in the master branch: commit 09bda36f10e2af733aacf250d8d57aab592a1a8e Author: Stephane Glondu st...@glondu.net Date: Tue Jul 12 08:48:56 2011 +0200 Switch source package format to 3.0 (quilt) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/control b/debian/control index cad4a62..3b12bfe 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Stéphane Glondu glo...@debian.org Build-Depends: debhelper (= 7.2.11~), - quilt (= 0.46-7~), ocaml-nox (= 3.11.1-3~), camlp4, libsqlite3-dev (= 3.3.9), diff --git a/debian/rules b/debian/rules index bdf9218..59cb9d5 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlvars.mk DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) %: - dh --with quilt,ocaml $@ + dh --with ocaml $@ .PHONY: override_dh_auto_configure override_dh_auto_configure: diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- ocaml-sqlite3 packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
