[Pkg-ocaml-maint-commits] [SCM] coq-float packaging branch, master, updated. debian/1%8.2-1.2-6-6-gbd9137b

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 42003df9297f97d119bb98b11052192adebf5fed
Author: Stephane Glondu st...@glondu.net
Date:   Fri Feb 11 18:25:09 2011 +0100

Ignore .pc when scanning for .v files...

diff --git a/debian/rules b/debian/rules
index ea9f1e8..debe960 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_configure:
for u in $(FILES_TO_BACKUP); do \
  if [ ! -f $$u.backup ]; then cp $$u $$u.backup; fi \
done
-   coq_makefile $(INCDIRS) $(shell find . -name \*.v)  Makefile
+   coq_makefile $(INCDIRS) $(shell find . -name .pc -prune -or -name \*.v 
-print )  Makefile
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
coq-float 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] coq-float packaging branch, master, updated. debian/1%8.2-1.2-6-6-gbd9137b

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 2204ea29520b9d51efcd7ce9b9bcdac525b8b79d
Author: Stephane Glondu st...@glondu.net
Date:   Thu Mar 10 22:17:56 2011 +0100

Rebuild with new coq (no changes)

diff --git a/debian/changelog b/debian/changelog
index 6b46f95..87778c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+coq-float (1:8.2-1.2-6) unstable; urgency=low
+
+  * Rebuild with coq 8.2.pl2+dfsg-2 (no changes)
+
+ -- Stéphane Glondu glo...@debian.org  Thu, 10 Mar 2011 22:17:35 +0100
+
 coq-float (1:8.2-1.2-5) unstable; urgency=low
 
   * Rebuild with Coq 8.2pl2
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..9916b90 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,4 @@
 [DEFAULT]
 pristine-tar = True
+debian-branch = sid/master
+upstream-branch = sid/upstream

-- 
coq-float 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] coq-float packaging branch, master, updated. debian/1%8.2-1.2-6-6-gbd9137b

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit c1151c393a3f31303e2611388c99ca2ea66352dc
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 22:30:24 2011 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ed24107..7728e9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-coq-float (1:8.2-1.2-6) UNRELEASED; urgency=low
+coq-float (1:8.2-1.2-6) unstable; urgency=low
 
   * Add patch to fix build with Coq 8.3
   * Bump Standards-Version to 3.9.1 (no changes)
 
- -- Stéphane Glondu glo...@debian.org  Fri, 11 Feb 2011 18:10:15 +0100
+ -- Stéphane Glondu glo...@debian.org  Tue, 19 Apr 2011 22:30:18 +0200
 
 coq-float (1:8.2-1.2-5) unstable; urgency=low
 

-- 
coq-float 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] coq-float packaging branch, master, updated. debian/1%8.2-1.2-6-6-gbd9137b

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit bd9137bfbe4c573f5780e6957248157a9a08dcbe
Merge: c1151c393a3f31303e2611388c99ca2ea66352dc 
2204ea29520b9d51efcd7ce9b9bcdac525b8b79d
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 23:12:52 2011 +0200

Merge branch 'sid/master'

diff --combined debian/changelog
index 7728e9f,87778c3..6e03263
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
- coq-float (1:8.2-1.2-6) unstable; urgency=low
++coq-float (1:8.2-1.2-7) unstable; urgency=low
 +
 +  * Add patch to fix build with Coq 8.3
 +  * Bump Standards-Version to 3.9.1 (no changes)
 +
 + -- Stéphane Glondu glo...@debian.org  Tue, 19 Apr 2011 22:30:18 +0200
 +
+ coq-float (1:8.2-1.2-6) unstable; urgency=low
+ 
+   * Rebuild with coq 8.2.pl2+dfsg-2 (no changes)
+ 
+  -- Stéphane Glondu glo...@debian.org  Thu, 10 Mar 2011 22:17:35 +0100
+ 
  coq-float (1:8.2-1.2-5) unstable; urgency=low
  
* Rebuild with Coq 8.2pl2

-- 
coq-float 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