[Pkg-ocaml-maint-commits] [SCM] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit f196a75bbc75c827eb8698dffe100ee3e4e3443c
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:30:40 2013 +0200

Refresh patches

diff --git a/debian/patches/0001-Remove-some-invalid-characters.patch 
b/debian/patches/0001-Remove-some-invalid-characters.patch
index b24dcbd..88810f9 100644
--- a/debian/patches/0001-Remove-some-invalid-characters.patch
+++ b/debian/patches/0001-Remove-some-invalid-characters.patch
@@ -1,10 +1,10 @@
 From: Samuel Mimram smim...@debian.org
 Date: Wed, 23 Sep 2009 18:55:38 +0200
-Subject: [PATCH] Remove some invalid characters
+Subject: Remove some invalid characters
 
 ---
  menhir.1 |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/menhir.1 b/menhir.1
 index e241b91..ac2940c 100644

-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 17e5e4317f16addf808fa942dc328ad2a407d8ff
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:29:59 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index c1bd9e0..f4e4967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+menhir (20130116.dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu glo...@debian.org  Wed, 24 Jul 2013 15:29:50 +0200
+
 menhir (20120123.dfsg-1) unstable; urgency=low
 
   * New upstream release

-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 6009f1c129bb3d4703e5fb0edcc7dcab3cc3a20a
Merge: 1835778c717f4308f3321d38fdc30b3b3bc7011c 
478a43eda44298fd5fee5035044d105c06d7afe0
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:28:58 2013 +0200

Merge tag 'upstream/20130116.dfsg'

Upstream version 20130116.dfsg


-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 5ce14a8af663823c811684feb92b9771df2e9b55
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:34:21 2013 +0200

Switch source package format to 3.0 (quilt)

diff --git a/debian/control b/debian/control
index a61ec96..44d81ad 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
   Mehdi Dogguy me...@debian.org
 Build-Depends:
   debhelper (= 7.0.50),
-  quilt (= 0.46-7),
   ocaml-nox (= 3.11.1-3~),
   dh-ocaml (= 0.9)
 Standards-Version: 3.9.2
diff --git a/debian/rules b/debian/rules
index 7176c47..7793294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,4 +17,4 @@ override_dh_auto_install:
cp src/menhir.$(OCAML_BEST) $(DESTDIR)/usr/bin/menhir
 
 %:
-   dh --with quilt,ocaml $@
+   dh --with ocaml $@
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

-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit e3ab64f611ce1c84f0ae28dd6532db6fb87017e5
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:47:25 2013 +0200

Compile with OCaml = 4

diff --git a/debian/control b/debian/control
index 1bee9a4..8d7ed7b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
   Mehdi Dogguy me...@debian.org
 Build-Depends:
   debhelper (= 7.0.50),
-  ocaml-nox (= 3.11.1-3~),
+  ocaml-nox (= 4),
   dh-ocaml (= 0.9)
 Standards-Version: 3.9.2
 Homepage: http://gallium.inria.fr/~fpottier/menhir/

-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 629bd410bc97b1f8c29b6bcfd860203cf92e34d6
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:42:51 2013 +0200

There are no tests

diff --git a/debian/rules b/debian/rules
index 7793294..f5fee37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,7 @@ override_dh_auto_clean:
 override_dh_auto_install:
cp src/menhir.$(OCAML_BEST) $(DESTDIR)/usr/bin/menhir
 
+override_dh_auto_test:
+
 %:
dh --with ocaml $@

-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 4f1fa1288bd5cca59f9196bddd062b9719bfffef
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:40:05 2013 +0200

Update Vcs-*

diff --git a/debian/control b/debian/control
index 44d81ad..1bee9a4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
   dh-ocaml (= 0.9)
 Standards-Version: 3.9.2
 Homepage: http://gallium.inria.fr/~fpottier/menhir/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/menhir.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/menhir.git
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/menhir.git
+Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/menhir.git
 
 Package: menhir
 Architecture: any

-- 
menhir 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] menhir packaging branch, master, updated. debian/20120123.dfsg-1-11-g7f5a90a

2013-07-24 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 7f5a90a9a61562039e4ceb39efce536521a72d41
Author: Stephane Glondu st...@glondu.net
Date:   Wed Jul 24 15:47:52 2013 +0200

Update changelog and prepare upload to experimental

diff --git a/debian/changelog b/debian/changelog
index f4e4967..1b21abe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-menhir (20130116.dfsg-1) UNRELEASED; urgency=low
+menhir (20130116.dfsg-1) experimental; urgency=low
 
+  * Team upload
   * New upstream release
+  * Switch source package format to 3.0 (quilt)
+  * Update Vcs-*
+  * Compile with OCaml = 4
 
- -- Stéphane Glondu glo...@debian.org  Wed, 24 Jul 2013 15:29:50 +0200
+ -- Stéphane Glondu glo...@debian.org  Wed, 24 Jul 2013 15:47:49 +0200
 
 menhir (20120123.dfsg-1) unstable; urgency=low
 

-- 
menhir 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