[Pkg-ocaml-maint-commits] [SCM] aac-tactics packaging branch, master, updated. debian/0.2.pl2-7-6-g0ed3399

2012-09-21 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 7ebd874126a513c29a8b10e7e6ea2c7e745ab33c
Merge: 967ef647c79fa0409671b819a1ab5477419eb762 
8917ab003a9b7f2abf8e399b5e7ad013b31a2e0e
Author: Stephane Glondu st...@glondu.net
Date:   Thu Sep 20 09:41:14 2012 +0200

Merge tag 'upstream/0.3'

Upstream version 0.3


-- 
aac-tactics 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] aac-tactics packaging branch, master, updated. debian/0.2.pl2-7-6-g0ed3399

2012-09-21 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit ddbf346e5eaaffe84ccb54ea6c10271d1b095121
Author: Stephane Glondu st...@glondu.net
Date:   Thu Sep 20 09:41:42 2012 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 23c78a2..efac44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aac-tactics (0.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu glo...@debian.org  Thu, 20 Sep 2012 09:41:21 +0200
+
 aac-tactics (0.2.pl2-7) unstable; urgency=low
 
   * Recompile with camlp5 6.06 (no changes)

-- 
aac-tactics 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] aac-tactics packaging branch, master, updated. debian/0.2.pl2-7-6-g0ed3399

2012-09-21 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit ab163e5d566da27cb7f76b5c3e9a5aa065dd8a47
Author: Stephane Glondu st...@glondu.net
Date:   Fri Sep 21 18:30:29 2012 +0200

Bump Coq version

diff --git a/debian/control b/debian/control
index cf70410..ceea267 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 8),
  dh-ocaml (= 0.9~),
  ocaml-nox (= 3.11.1-3~),
- coq (= 8.3),
+ coq (= 8.4),
  libcoq-ocaml-dev
 Standards-Version: 3.9.2
 Homepage: http://sardes.inrialpes.fr/~braibant/aac_tactics/

-- 
aac-tactics 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] aac-tactics packaging branch, master, updated. debian/0.2.pl2-7-6-g0ed3399

2012-09-21 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 0ed339960aa5d8016380540a0d4a64abb8333989
Author: Stephane Glondu st...@glondu.net
Date:   Fri Sep 21 19:19:33 2012 +0200

Prepare upload to experimental

diff --git a/debian/changelog b/debian/changelog
index efac44d..59961df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-aac-tactics (0.3-1) UNRELEASED; urgency=low
+aac-tactics (0.3-1) experimental; urgency=low
 
   * New upstream release
 
- -- Stéphane Glondu glo...@debian.org  Thu, 20 Sep 2012 09:41:21 +0200
+ -- Stéphane Glondu glo...@debian.org  Fri, 21 Sep 2012 19:19:27 +0200
 
 aac-tactics (0.2.pl2-7) unstable; urgency=low
 

-- 
aac-tactics 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] aac-tactics packaging branch, master, updated. debian/0.2.pl2-7-6-g0ed3399

2012-09-21 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit f5afac0b71c851242401099e19a03fd8c64871ef
Author: Stephane Glondu st...@glondu.net
Date:   Fri Sep 21 18:30:14 2012 +0200

Update build system

diff --git a/debian/libaac-tactics-coq.doc-base.api 
b/debian/libaac-tactics-coq.doc-base.api
deleted file mode 100644
index 97c229f..000
--- a/debian/libaac-tactics-coq.doc-base.api
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: aac-tactics-api-reference
-Title: aac_tactics API Reference
-Abstract: API reference for aac_tactics (generated from ML sources via 
OCamldoc)
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libaac-tactics-coq/api/index.html
-Files: /usr/share/doc/libaac-tactics-coq/api/*
diff --git a/debian/libaac-tactics-coq.install 
b/debian/libaac-tactics-coq.install
new file mode 100644
index 000..ea6c204
--- /dev/null
+++ b/debian/libaac-tactics-coq.install
@@ -0,0 +1,2 @@
+  /usr/lib/coq/user-contrib/AAC_tactics/*.vo
+html/*/usr/share/doc/libaac-tactics-coq/theories
diff --git a/debian/libaac-tactics-coq.install.in 
b/debian/libaac-tactics-coq.install.in
deleted file mode 100644
index 42cf10a..000
--- a/debian/libaac-tactics-coq.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-*.vo  /usr/lib/coq/user-contrib/AAC_tactics/
-doc/* /usr/share/doc/libaac-tactics-coq/api
-html/*/usr/share/doc/libaac-tactics-coq/theories
diff --git a/debian/libaac-tactics-ocaml-dev.install 
b/debian/libaac-tactics-ocaml-dev.install
new file mode 100644
index 000..18a9b3c
--- /dev/null
+++ b/debian/libaac-tactics-ocaml-dev.install
@@ -0,0 +1,2 @@
+ usr/lib/coq/user-contrib/AAC_tactics/*.cmi
+*.mliusr/lib/coq/user-contrib/AAC_tactics/
diff --git a/debian/libaac-tactics-ocaml-dev.install.in 
b/debian/libaac-tactics-ocaml-dev.install.in
deleted file mode 100644
index 74548b3..000
--- a/debian/libaac-tactics-ocaml-dev.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-*.cmi /usr/lib/coq/user-contrib/AAC_tactics/
-*.mli /usr/lib/coq/user-contrib/AAC_tactics/
-OPT: *.cmx/usr/lib/coq/user-contrib/AAC_tactics/
-OPT: *.cmxa   /usr/lib/coq/user-contrib/AAC_tactics/
-OPT: *.a  /usr/lib/coq/user-contrib/AAC_tactics/
diff --git a/debian/libaac-tactics-ocaml-dev.lintian-overrides 
b/debian/libaac-tactics-ocaml-dev.lintian-overrides
new file mode 100644
index 000..b102d8b
--- /dev/null
+++ b/debian/libaac-tactics-ocaml-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# aac.cmo is a pack
+libaac-tactics-ocaml-dev: ocaml-dangling-cmi 
usr/lib/coq/user-contrib/AAC_tactics/aac.cmi
diff --git a/debian/libaac-tactics-ocaml-dev.ocamldoc 
b/debian/libaac-tactics-ocaml-dev.ocamldoc
new file mode 100644
index 000..83a7cff
--- /dev/null
+++ b/debian/libaac-tactics-ocaml-dev.ocamldoc
@@ -0,0 +1,3 @@
+-rectypes
+-I /usr/lib/coq/kernel -I /usr/lib/coq/proofs -I /usr/lib/coq/pretyping
+--include debian/libaac-tactics-ocaml-dev/usr/lib/coq
diff --git a/debian/libaac-tactics-ocaml.install.in 
b/debian/libaac-tactics-ocaml.install.in
index 2ede221..b6795bd 100644
--- a/debian/libaac-tactics-ocaml.install.in
+++ b/debian/libaac-tactics-ocaml.install.in
@@ -1,2 +1,2 @@
-aac_tactics.cma   /usr/lib/coq/user-contrib/AAC_tactics/
-DYN: aac_tactics.cmxs /usr/lib/coq/user-contrib/AAC_tactics/
+ usr/lib/coq/user-contrib/AAC_tactics/*.cmo
+DYN: usr/lib/coq/user-contrib/AAC_tactics/*.cmxs
diff --git a/debian/rules b/debian/rules
index da4c4c4..792a1d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,22 +6,18 @@ include /usr/share/coq/coqvars.mk
 %:
dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-   ./make_makefile
-
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
$(MAKE) world
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-# install rule as generated by coq_makefile is buggy
+   $(MAKE) -f Makefile.coq install DSTROOT=$(CURDIR)/debian/tmp
+
+.PHONY: override_dh_install
+override_dh_install:
+   dh_install --fail-missing
 
 .PHONY: override_dh_gencontrol
 override_dh_gencontrol:
dh_gencontrol -- -VF:CoqABI=$(COQ_ABI)
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-   rm -Rf .depend *.glob *.d *.*o *.*a *.cm* doc html

-- 
aac-tactics 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