The following commit has been merged in the master branch:
commit cbc4dc357e591e96edf09347b4101e8f626f6ad1
Author: Hendrik Tews <hend...@askra.de>
Date:   Mon May 27 23:41:48 2013 +0200

    architecture any and other packaging fixes

diff --git a/debian/changelog b/debian/changelog
index 6588a16..b46ecee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-camlmix (1.3.0-4) UNRELEASED; urgency=low
+camlmix (1.3.1-1) unstable; urgency=low
 
   [ Sylvain La Gall ]
   * Remove Sylvain Le Gall from uploaders
@@ -7,8 +7,13 @@ camlmix (1.3.0-4) UNRELEASED; urgency=low
   * fix watch file
   * fix copyright file
   * added myself as uploader
+  * import new upstream version
+  * change to architecture any for native compilation and
+    adapt rules and dependencies 
+  * bump standards version and debhelper compat level
+  * add patch fix-lintian-spelling-error to fix a spelling error
 
- -- Hendrik Tews <hend...@askra.de>  Mon, 27 May 2013 15:39:38 +0200
+ -- Hendrik Tews <hend...@askra.de>  Mon, 27 May 2013 23:49:26 +0200
 
 camlmix (1.3.0-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index c122733..857cb16 100644
--- a/debian/control
+++ b/debian/control
@@ -4,19 +4,23 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
 Uploaders:
  Hendrik Tews <hend...@askra.de>
-Build-Depends-Indep:
+Build-Depends:
   ocaml-nox (>= 3.11.1-3~),
+  ocaml-best-compilers,
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~)
-Standards-Version: 3.9.1
+  debhelper (>= 9)
+Standards-Version: 3.9.4
 Homepage: http://mjambon.com/camlmix/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlmix.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlmix.git
 
 Package: camlmix
-Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Architecture: any
+Depends: 
+ ${ocaml:Depends}, 
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: preprocessor which converts text with embedded OCaml
  Camlmix is a generic preprocessor which converts text with embedded OCaml into
  an OCaml program with embedded text. It produces text documents from one or
diff --git a/debian/patches/fix-lintian-spelling-error.patch 
b/debian/patches/fix-lintian-spelling-error.patch
new file mode 100644
index 0000000..679e2b9
--- /dev/null
+++ b/debian/patches/fix-lintian-spelling-error.patch
@@ -0,0 +1,13 @@
+Description: fix a lintian spelling error
+Author: Hendrik Tews <hend...@askra.de>
+--- a/main.ml
++++ b/main.ml
+@@ -43,7 +43,7 @@
+ Advanced usage:
+ The OCaml program that is generated from the Camlmix files first defines
+ a module called Camlmix. This module contains several variables that are 
+-updated automatically and may be used explicitely by the user.
++updated automatically and may be used explicitly by the user.
+ 
+ module Camlmix :
+   sig
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d6ad538
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-lintian-spelling-error.patch
diff --git a/debian/rules b/debian/rules
index 84f41ac..a32bc3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,31 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/camlmix
 
 include /usr/share/ocaml/ocamlvars.mk
 
 %:
-       dh --with ocaml $@
+       dh $@ --with ocaml
+
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-       make all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+       make OCAMLOPT=ocamlopt.opt native
+else
+       make byte
+endif
+
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
        mkdir -p '$(DESTDIR)/usr/bin'
        make install 'PREFIX=$(DESTDIR)/usr'
 
-debian/camlmix.1: debian/camlmix.mkd
-       pandoc -s -w man $^ -o $@
+# debian/camlmix.1: debian/camlmix.mkd
+#      pandoc -s -w man $^ -o $@
 

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

Reply via email to