[Pkg-ocaml-maint-commits] [SCM] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch: commit 6672fcebcc25a6b1ef78e73f370420a0c0082a73 Author: Sylvain Le Gall gil...@debian.org Date: Sun Mar 24 13:06:08 2013 +0100 Fix missing debhelper token. diff --git a/src/DhFiles.ml b/src/DhFiles.ml index 9332cd2..5d5716a 100644 --- a/src/DhFiles.ml +++ b/src/DhFiles.ml @@ -411,6 +411,8 @@ let dh_script_split fn = set -e +#DEBHELPER# + $insertion_point)); split (lines_of_file (debian_fn fn)) -- oasis2debian project ___ 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] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch:
commit 99688cbf3cfd9d995a56f851279432a39fcabdce
Author: Sylvain Le Gall gil...@debian.org
Date: Sun Mar 24 23:33:26 2013 +0100
Add adduser if using --group.
diff --git a/src/ActInit.ml b/src/ActInit.ml
index e2976ec..188e1e0 100644
--- a/src/ActInit.ml
+++ b/src/ActInit.ml
@@ -112,7 +112,7 @@ let run ~ctxt args =
in
let () =
-Control.create t;
+Control.create ~ctxt t;
Copyright.create ~ctxt t;
Rules.create t;
DhFiles.create ~ctxt t;
diff --git a/src/Control.ml b/src/Control.ml
index bf85c8c..512b675 100644
--- a/src/Control.ml
+++ b/src/Control.ml
@@ -23,7 +23,7 @@ open OASISTypes
open Common
open ExtString
-let create t =
+let create ~ctxt t =
let sep =
,\n
in
@@ -39,6 +39,13 @@ let create t =
t.deb_name
in
+ let exec_depends =
+if Conf.get ~ctxt Group.group None then
+ adduser,
+else
+
+ in
+
let description =
let lst =
List.map
@@ -101,7 +108,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/${src_name}.git;)
output_intro deb_pkg;
output_content
(interpolate \
-Depends: \${misc:Depends}, \${ocaml:Depends}
+Depends: $exec_depends\${misc:Depends}, \${ocaml:Depends}
Description: $t.pkg.synopsis
$description);
if t.deb_dev None then
--
oasis2debian project
___
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] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch: commit a1a4769068e0f7dfb39ee5caee282b7020757a07 Author: Sylvain Le Gall gil...@debian.org Date: Sun Mar 24 23:53:31 2013 +0100 Allow to ignore lintian warnings. diff --git a/src/ActInit.ml b/src/ActInit.ml index 188e1e0..87d1a77 100644 --- a/src/ActInit.ml +++ b/src/ActInit.ml @@ -119,6 +119,6 @@ let run ~ctxt args = Group.create ~ctxt t; DpkgStatOverride.create ~ctxt t; DhDirs.create ~ctxt t; +LintianOverrides.create ~ctxt t; in - () diff --git a/src/LintianOverrides.ml b/src/LintianOverrides.ml new file mode 100644 index 000..d15b704 --- /dev/null +++ b/src/LintianOverrides.ml @@ -0,0 +1,18 @@ + +open Common + +let no_manpage = + let lst = ref [] in +Conf.create_full + ~cli:--no-manpage + (fun s - lst := s :: !lst; !lst) + exec Disable lintian warning for the given exec without a manpage. + (Conf.Value !lst) + +let add lintian_id arg = + debian_with_append_fn +lintian-overrides +(output_content (Printf.sprintf %s %s lintian_id arg)) + +let create ~ctxt t = + List.iter (add binary-without-manpage) (Conf.get ~ctxt no_manpage) diff --git a/test/test.ml b/test/test.ml index 2698598..e6fabf7 100644 --- a/test/test.ml +++ b/test/test.ml @@ -28,7 +28,8 @@ let oasis2debian = let args_for_tarball = [ocamlify-0.0.1.tar.gz, - [--homepage; http://forge.ocamlcore.org/projects/ocamlify;]; + [--homepage; http://forge.ocamlcore.org/projects/ocamlify;; +--no-manpage; usr/bin/ocamlify]; ocamlmod-0.0.3.tar.gz, [--homepage; http://forge.ocamlcore.org/projects/ocamlmod;]; @@ -38,7 +39,8 @@ let args_for_tarball = --group; sekred,/var/lib/sekred; --dh-dirs; sekred,var/lib/sekred/domains; --dpkg-statoverride; /usr/bin/sekred,root,sekred,2755; - --dpkg-statoverride; /var/lib/sekred/domains,root,sekred,1730]; + --dpkg-statoverride; /var/lib/sekred/domains,root,sekred,1730; +--no-manpage; usr/bin/sekred]; ] let tests = -- oasis2debian project ___ 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] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch:
commit 3685d29d603e8c441c84a8980db34f8cee5345f2
Author: Sylvain Le Gall gil...@debian.org
Date: Mon Mar 25 01:16:36 2013 +0100
Don't use dch for changelog, override warnings when no ITP set for new
package.
diff --git a/INSTALL.txt b/INSTALL.txt
index 2b72919..a5cfa12 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: b83bfe827d8d8aad6e30959d0c601d33) *)
+(* DO NOT EDIT (digest: 22e1a572dc120ddf5d09e000ae553339) *)
This is the INSTALL file for the oasis2debian distribution.
This package uses OASIS to generate its build system. See section OASIS for
@@ -18,6 +18,7 @@ In order to compile this package, you will need:
* debian-formats (= 0.0.1) for executable oasis2debian
* xdg-basedir (= 0.0.1) for executable oasis2debian
* inifiles (= 1.2) for executable oasis2debian
+* calendar for executable oasis2debian
* oUnit (= 2.0.0) for executable test
* tar for test main
* ocamlmod for test main
diff --git a/_oasis b/_oasis
index fc604f6..befe9a9 100644
--- a/_oasis
+++ b/_oasis
@@ -18,7 +18,8 @@ Executable oasis2debian
pcre,
debian-formats (= 0.0.1),
xdg-basedir (= 0.0.1),
-inifiles (= 1.2)
+inifiles (= 1.2),
+calendar
Executable test
Path: test
diff --git a/_tags b/_tags
index 51e7d7a..7c8b2e1 100644
--- a/_tags
+++ b/_tags
@@ -20,7 +20,7 @@
# OASIS_START
-# DO NOT EDIT (digest: d161ee651e970b488f7fbdded448d3cb)
+# DO NOT EDIT (digest: c932dfb6daa5bda5609b5c58855b5e6e)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -43,6 +43,7 @@
src/Main.byte: pkg_debian-formats
src/Main.byte: pkg_xdg-basedir
src/Main.byte: pkg_inifiles
+src/Main.byte: pkg_calendar
src/*.ml{,i}: pkg_fileutils
src/*.ml{,i}: pkg_oasis
src/*.ml{,i}: pkg_oasis.base
@@ -51,6 +52,7 @@
src/*.ml{,i}: pkg_debian-formats
src/*.ml{,i}: pkg_xdg-basedir
src/*.ml{,i}: pkg_inifiles
+src/*.ml{,i}: pkg_calendar
# Executable test
test/test.byte: pkg_oUnit
test/test.byte: pkg_fileutils
@@ -64,6 +66,7 @@
src/ActInit.ml: syntax_camlp4o
src/Control.ml: syntax_camlp4o
+src/Changelog.ml: syntax_camlp4o
src/Copyright.ml: syntax_camlp4o
src/Rules.ml: syntax_camlp4o
src/DhFiles.ml: syntax_camlp4o
diff --git a/setup.ml b/setup.ml
index 10f535f..bc5aa6d 100644
--- a/setup.ml
+++ b/setup.ml
@@ -22,7 +22,7 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 462168c2fc1d5b1fe5aa9f976b82e9c4) *)
+(* DO NOT EDIT (digest: 17801e9964c4ceb7fb46226b5d4cb080) *)
(*
Regenerated by OASIS v0.3.1
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6109,7 +6109,8 @@ let setup_t =
Some (OASISVersion.VGreaterEqual 0.0.1));
FindlibPackage
(inifiles,
- Some (OASISVersion.VGreaterEqual 1.2))
+ Some (OASISVersion.VGreaterEqual 1.2));
+ FindlibPackage (calendar, None)
];
bs_build_tools = [ExternalTool ocamlbuild];
bs_c_sources = [];
@@ -6200,7 +6201,7 @@ let setup_t =
};
oasis_fn = Some _oasis;
oasis_version = 0.3.1;
- oasis_digest = Some \141�Y�\129��=��ծ%\026�\031;
+ oasis_digest = Some ��FD�\026�\145Kz�!;
oasis_exec = None;
oasis_setup_args = [-setup-update; weak];
setup_update = true;
@@ -6208,6 +6209,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 6191 setup.ml
+# 6192 setup.ml
(* OASIS_STOP *)
let () = setup ();;
diff --git a/src/ActInit.ml b/src/ActInit.ml
index 87d1a77..096103b 100644
--- a/src/ActInit.ml
+++ b/src/ActInit.ml
@@ -27,25 +27,6 @@ open OASISMessage
open FileUtil
open Common
-let itp =
- Conf.create
-~cli:--itp
-int Bug number of the ITP for the package.
-Conf.ShortInput
-
-let bts_query =
- Conf.create_full
-~cli:--bts-query
-bool_of_string
-bool Query the BTS for ITP (true/false).
-(Conf.Value true)
-
-let distribution =
- Conf.create
-~cli:--distribution
-str Distribution for the package.
-Conf.ShortInput
-
let dh_compat = 7
let run ~ctxt args =
@@ -76,42 +57,8 @@ let run ~ctxt args =
(output_content 3.0 (quilt))
in
- (* Create debian/changelog *)
- let () =
-let pkg_version =
- OASISVersion.string_of_version t.pkg.version
-in
-
-if debian_not_exist changelog then
- begin
-let opts =
-
-in
-let opts =
- if Conf.is_set itp then
-opts^ --closes
[Pkg-ocaml-maint-commits] [SCM] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch: commit e4b433010fd297f19fb02e6deca06a3ee0dac3a1 Author: Sylvain Le Gall gil...@debian.org Date: Mon Mar 25 01:25:43 2013 +0100 Improve display of --help. diff --git a/src/Copyright.ml b/src/Copyright.ml index b22aa05..b5a8c41 100644 --- a/src/Copyright.ml +++ b/src/Copyright.ml @@ -27,7 +27,7 @@ open Common let copyrights = Conf.create ~cli:--copyrights -Copyright holds of the package +str Copyright holders of the package. Conf.ShortInput let todo ~ctxt msg = diff --git a/src/GenPkg.ml b/src/GenPkg.ml index 5ea6871..91964bb 100644 --- a/src/GenPkg.ml +++ b/src/GenPkg.ml @@ -28,7 +28,7 @@ open Common let library_name = Conf.create ~cli:--library-name -Short name of the library (XXX in libXXX-ocaml-dev) +pkg_name Short name of the library (XXX in libXXX-ocaml-dev). (Conf.Fun (fun () - failwith Not set)) @@ -36,7 +36,7 @@ let library_name = let executable_name = Conf.create ~cli:--executable-name -Full name of the package that contains executables +pkg_name Full name of the package that contains executables. (Conf.Fun (fun () - failwith Not set)) diff --git a/src/Load.ml b/src/Load.ml index b547d47..851c704 100644 --- a/src/Load.ml +++ b/src/Load.ml @@ -31,19 +31,19 @@ open FileUtil let description = Conf.create ~cli:--description -Long description of the package +str Long description of the package Conf.LongInput let homepage = Conf.create ~cli:--homepage -Homepage of the package +url Homepage of the package Conf.ShortInput let uploader = Conf.create ~cli:--uploader -Uploader of the package +email Uploader of the package (Conf.Fun (fun () - try @@ -59,7 +59,7 @@ let uploader = let deb_name = Conf.create ~cli:--debian-name -Source package name in Debian (e.g. extunix becomes ocaml-extunix) +str Source package name in Debian (e.g. extunix becomes ocaml-extunix) Conf.ShortInput -- oasis2debian project ___ 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] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch:
commit 65a9efbb95deb22e7f4663f3423732578ccc7ebe
Author: Sylvain Le Gall gil...@debian.org
Date: Sun Mar 24 01:22:31 2013 +0100
Create a more precise test suite.
Use tarballs to test, build the results and run lintian over it.
diff --git a/INSTALL.txt b/INSTALL.txt
index 357d694..2b72919 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 96893f4af218c48c9d244581d361e83f) *)
+(* DO NOT EDIT (digest: b83bfe827d8d8aad6e30959d0c601d33) *)
This is the INSTALL file for the oasis2debian distribution.
This package uses OASIS to generate its build system. See section OASIS for
@@ -9,16 +9,18 @@ Dependencies
In order to compile this package, you will need:
-* ocaml for all, test main, test ocaml-sqlexpr
+* ocaml for all, test main
* findlib
-* oasis (= 0.3.1) for executable oasis2debian
+* oasis (= 0.3.1)
* xstrp4 (= 1.8) for executable oasis2debian
* fileutils (= 0.4.2)
* pcre for executable oasis2debian
* debian-formats (= 0.0.1) for executable oasis2debian
* xdg-basedir (= 0.0.1) for executable oasis2debian
* inifiles (= 1.2) for executable oasis2debian
-* oUnit (= 1.1.0) for executable test
+* oUnit (= 2.0.0) for executable test
+* tar for test main
+* ocamlmod for test main
Installing
==
diff --git a/Makefile b/Makefile
index 8c9c3a3..12dfef1 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ default: test reinstall
#default: reinstall
reinstall: build
-
# OASIS_START
# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
diff --git a/_oasis b/_oasis
index 2950d5f..fc604f6 100644
--- a/_oasis
+++ b/_oasis
@@ -1,4 +1,4 @@
-OASISFormat: 0.2
+OASISFormat: 0.3
Name:oasis2debian
Version: 0.1.0
Synopsis:Create and maintain Debian package for an OASIS package
@@ -24,14 +24,8 @@ Executable test
Path: test
MainIs: test.ml
Install: false
- BuildDepends: oUnit (= 1.1.0), fileutils (= 0.4.2), unix
+ BuildDepends: oUnit (= 2.0.0), fileutils (= 0.4.2), unix, oasis
Test main
Command: $test -exec $oasis2debian
- TestTools: oasis2debian, test
- Run: false
-
-Test ocaml-sqlexpr
- Command: $oasis2debian update
- TestTools: oasis2debian
- WorkingDirectory: /home/gildor/debian/pkg-ocaml-maint/packages/ocaml-sqlexpr
+ TestTools: oasis2debian, test, tar, ocamlmod
diff --git a/_tags b/_tags
index 560c39b..51e7d7a 100644
--- a/_tags
+++ b/_tags
@@ -20,7 +20,7 @@
# OASIS_START
-# DO NOT EDIT (digest: 263ff8c84033e5bb80f738b31f25aa1e)
+# DO NOT EDIT (digest: d161ee651e970b488f7fbdded448d3cb)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -55,9 +55,11 @@
test/test.byte: pkg_oUnit
test/test.byte: pkg_fileutils
test/test.byte: pkg_unix
+test/test.byte: pkg_oasis
test/*.ml{,i}: pkg_oUnit
test/*.ml{,i}: pkg_fileutils
test/*.ml{,i}: pkg_unix
+test/*.ml{,i}: pkg_oasis
# OASIS_STOP
src/ActInit.ml: syntax_camlp4o
diff --git a/setup.ml b/setup.ml
index 9b146a4..10f535f 100644
--- a/setup.ml
+++ b/setup.ml
@@ -22,7 +22,7 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: cfc30cfd0f049b7818469a97793a903b) *)
+(* DO NOT EDIT (digest: 462168c2fc1d5b1fe5aa9f976b82e9c4) *)
(*
Regenerated by OASIS v0.3.1
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5980,14 +5980,6 @@ let setup_t =
];
cmd_clean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)];
- });
- (ocaml-sqlexpr,
-CustomPlugin.Test.main
- {
- CustomPlugin.cmd_main =
- [(OASISExpr.EBool true, ($oasis2debian, [update]))];
- cmd_clean = [(OASISExpr.EBool true, None)];
- cmd_distclean = [(OASISExpr.EBool true, None)];
})
];
doc = [];
@@ -6006,14 +5998,6 @@ let setup_t =
];
cmd_clean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)];
- });
- (ocaml-sqlexpr,
-CustomPlugin.Test.clean
- {
- CustomPlugin.cmd_main =
- [(OASISExpr.EBool true, ($oasis2debian, [update]))];
- cmd_clean = [(OASISExpr.EBool true, None)];
- cmd_distclean = [(OASISExpr.EBool true, None)];
})
];
clean_doc = [];
@@ -6030,20 +6014,12 @@ let setup_t =
];
cmd_clean = [(OASISExpr.EBool true, None)];
cmd_distclean = [(OASISExpr.EBool true, None)];
- });
-
[Pkg-ocaml-maint-commits] [SCM] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1
The following commit has been merged in the master branch:
commit 8013f77de308b64893b659301423f7da7e334c5b
Author: Sylvain Le Gall gil...@debian.org
Date: Mon Mar 25 01:22:19 2013 +0100
Use t.uploader rather than doing the same guess for author in Changelog.
diff --git a/src/Changelog.ml b/src/Changelog.ml
index 10a619d..c0eff8d 100644
--- a/src/Changelog.ml
+++ b/src/Changelog.ml
@@ -28,15 +28,6 @@ let create ~ctxt t =
else
in
- let author =
-try
- Printf.sprintf %s %s
-(Sys.getenv DEBFULLNAME)
-(Sys.getenv DEBEMAIL)
-with Not_found -
- failwith
-Set author using DEBFULLNAME and DEBEMAIL environment variables.
- in
debian_with_fn
changelog
(output_content
@@ -46,6 +37,6 @@ $t.pkg.name ($pkg_version-1) $distribution; urgency=low
* Initial release.$closes
* Generated with oasis2debian v${Version.ver}.
- -- $author ${date}))
+ -- $t.uploader ${date}))
--
oasis2debian project
___
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
