[Pkg-ocaml-maint-commits] [coq-doc] branch master updated (ed61815 -> ca67dd6)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to branch master in repository coq-doc. from ed61815 Update changelog and prepare upload to unstable new ca67dd6 fix ftbfs "unterminated string literal" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++ debian/patches/series | 1 + debian/patches/unterminated_string_literal | 17 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/patches/unterminated_string_literal -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coq-doc.git ___ 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] [coq-doc] annotated tag debian/8.4pl4-2 created (now 316232c)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to annotated tag debian/8.4pl4-2 in repository coq-doc. at 316232c (tag) tagging ca67dd6e1ceafd5f6daf2beed260aa2092af01db (commit) replaces debian/8.4pl4-1 tagged by Ralf Treinen on Thu Feb 11 09:06:07 2016 +0100 - Log - coq-doc Debian release 8.4pl4-2 Ralf Treinen (1): fix ftbfs "unterminated string literal" --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coq-doc.git ___ 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] [coq-doc] 01/01: fix ftbfs "unterminated string literal"
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository coq-doc. commit ca67dd6e1ceafd5f6daf2beed260aa2092af01db Author: Ralf TreinenDate: Thu Feb 11 08:28:29 2016 +0100 fix ftbfs "unterminated string literal" --- debian/changelog | 7 +++ debian/patches/series | 1 + debian/patches/unterminated_string_literal | 17 + 3 files changed, 25 insertions(+) diff --git a/debian/changelog b/debian/changelog index 78ca094..4913d35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +coq-doc (8.4pl4-2) unstable; urgency=medium + + * Team upload + * patch unterminated_string_literal: fix FTBFS with ocaml 4.02.3 + + -- Ralf Treinen Thu, 11 Feb 2016 08:48:56 +0100 + coq-doc (8.4pl4-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..f0607cd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +unterminated_string_literal diff --git a/debian/patches/unterminated_string_literal b/debian/patches/unterminated_string_literal new file mode 100644 index 000..cc1973a --- /dev/null +++ b/debian/patches/unterminated_string_literal @@ -0,0 +1,17 @@ +Author: Ralf Treinen +Description: fix FTBFS "unterminated string literal" with ocaml 4.02.3 +Debian-bug: 813063 + +Index: coq-doc/kernel/univ.ml +=== +--- coq-doc.orig/kernel/univ.ml2016-02-11 08:12:56.448329274 +0100 coq-doc/kernel/univ.ml 2016-02-11 08:27:43.756005774 +0100 +@@ -226,7 +226,7 @@ + + + (* between : UniverseLevel.t -> canonical_arc -> canonical_arc list *) +-(* between u v = {w|u<=w<=v, w canonical} *) ++(* between u v = { w|u<=w<=v, w canonical } *) + (* between is the most costly operation *) + + let between g arcu arcv = -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coq-doc.git ___ 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] [coinst] branch master updated (cc96dbb -> c6ff300)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch master in repository coinst. from cc96dbb Release to unstable new 63c5a05 Imported Upstream version 1.9.2 new 598ffa7 Merge tag 'upstream/1.9.2' new 0688ebd New upstream release new 87f8f00 Remove all patches, integrated upstream. new 08b4fcd Fix space/tab issue in viewer/Makefile new c6ff300 Release to unstable The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 5 +- BUGS.txt | 6 - CHANGES| 18 +++ Makefile | 30 +++- TODO.txt | 24 +++ bytearray.ml | 28 ++-- bytearray.mli | 8 +- cache.ml | 8 +- coinst.ml | 47 -- deb_lib.ml | 86 +- debian/changelog | 19 ++- .../0001-Fix-a-space-tab-issue-in-Makefile.patch | 21 +++ debian/patches/make_byte | 48 -- debian/patches/make_clean | 27 debian/patches/make_viewer_byte| 37 - debian/patches/ocaml_4.02.3| 45 -- debian/patches/series | 5 +- file.ml| 6 +- layout.ml | 55 +++ man/comigrate.1| 11 +- ptset.ml | 11 +- ptset.mli | 2 + quotient.ml| 4 +- rpm_lib.ml | 20 +-- solver.ml | 4 +- task.ml| 10 +- transition.ml | 174 - update_data.ml | 7 +- update_data.mli| 2 + upgrade_common.ml | 2 +- util.ml| 63 util.mli | 4 +- viewer/Makefile| 13 +- 33 files changed, 432 insertions(+), 418 deletions(-) create mode 100644 debian/patches/0001-Fix-a-space-tab-issue-in-Makefile.patch delete mode 100644 debian/patches/make_byte delete mode 100644 debian/patches/make_clean delete mode 100644 debian/patches/make_viewer_byte delete mode 100644 debian/patches/ocaml_4.02.3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] annotated tag upstream/1.9.2 created (now b52b16f)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to annotated tag upstream/1.9.2 in repository coinst. at b52b16f (tag) tagging 63c5a05486f316fc73de1a5b98b7f0d890b47ee9 (commit) replaces upstream/1.9.1 tagged by Mehdi Dogguy on Wed Feb 10 18:28:17 2016 +0100 - Log - Upstream version 1.9.2 Mehdi Dogguy (1): Imported Upstream version 1.9.2 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] 01/01: pristine-tar data for coinst_1.9.2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch pristine-tar in repository coinst. commit 3cf43fc519e91e9f6c426f58fcd211b65d1e82d8 Author: Mehdi DogguyDate: Wed Feb 10 18:28:17 2016 +0100 pristine-tar data for coinst_1.9.2.orig.tar.gz --- coinst_1.9.2.orig.tar.gz.delta | Bin 0 -> 3493 bytes coinst_1.9.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/coinst_1.9.2.orig.tar.gz.delta b/coinst_1.9.2.orig.tar.gz.delta new file mode 100644 index 000..d4427b1 Binary files /dev/null and b/coinst_1.9.2.orig.tar.gz.delta differ diff --git a/coinst_1.9.2.orig.tar.gz.id b/coinst_1.9.2.orig.tar.gz.id new file mode 100644 index 000..8366828 --- /dev/null +++ b/coinst_1.9.2.orig.tar.gz.id @@ -0,0 +1 @@ +d282b8e0a292b1a0f2e053f0bf219b3b2a342b47 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] branch pristine-tar updated (7dfe9b7 -> 3cf43fc)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch pristine-tar in repository coinst. from 7dfe9b7 pristine-tar data for coinst_1.9.1.orig.tar.gz new 3cf43fc pristine-tar data for coinst_1.9.2.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: coinst_1.9.2.orig.tar.gz.delta | Bin 0 -> 3493 bytes coinst_1.9.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 coinst_1.9.2.orig.tar.gz.delta create mode 100644 coinst_1.9.2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] 06/06: Release to unstable
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst. commit c6ff3008fcc41bfa15586861d64c01bfe39ad29c Author: Mehdi DogguyDate: Fri Feb 12 00:12:30 2016 +0100 Release to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ac888f..0dc27be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -coinst (1.9.2-1) UNRELEASED; urgency=medium +coinst (1.9.2-1) unstable; urgency=medium * New upstream release: - Avoid ambiguous output when package has multiple versions @@ -11,7 +11,7 @@ coinst (1.9.2-1) UNRELEASED; urgency=medium * Fix space/tab issue in viewer/Makefile - add debian/patches/0001-Fix-a-space-tab-issue-in-Makefile.patch - -- Mehdi Dogguy Wed, 10 Feb 2016 18:58:01 +0100 + -- Mehdi Dogguy Fri, 12 Feb 2016 00:12:30 +0100 coinst (1.9.1-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] annotated tag debian/1.9.2-1 created (now a75b7d1)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to annotated tag debian/1.9.2-1 in repository coinst. at a75b7d1 (tag) tagging c6ff3008fcc41bfa15586861d64c01bfe39ad29c (commit) replaces debian/1.9.1-2 tagged by Mehdi Dogguy on Fri Feb 12 00:12:32 2016 +0100 - Log - coinst Debian release 1.9.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJWvRVgAAoJEDO+GgqMLtj/GEMP/3vhOvEJW784eNfn33BrHDUl qSPkvBGHYzpSXt+f8eIxZ/3ouUHm5mqhcR6zIxdyogZGg4D2ucyXPyRrw0/Ri5X6 p+ZWVfOsMbyqfPJsk0Up/5WcMh7DPPsfH7zzvxiG5s4Qj7Z1G5sXpO7JsaHEY+vP yFQWmB8uykJD7TRc3OzMH0Y+BZpzLMyxLs3DsD1s+c6ES4EwnLYMxx2gweq3sN3l BWvKf2TxDzLRugArYO96bTWGR3RMuAwSJbuScghJYppjOJw26fWlI7SRqBC0K9Pd l6GeQTjMdtN/uRJwUOrtfbp/5g+BAtkIygT9KdKnFIlPX53P1MGeNU+kR4fQ1By/ OknpAwb9zQU45B/OFKSJp2a1ekXug9L0RH4cj1emUS9Z1zxmeko113epC/FNkuQs CqcQV0T4MVCvQzEkY93S/UURFPXqzGx1oqZ34K2mim5MSRQUmCCSfbKAZ02E7Zyj hxUDKsX1y/nGc0bjGKFL4gwziRGa84Kg1MCRaiI+s3aroiITB8HBhyUKyQX+9p7i cRwdM14rkIgiBnhdHz2OpuWGAboDX0JpYylIzt6WrkR3di8ZRiCqJvyZLogCV6wo cQ/k6DhpQrMmtRlWsQLIUek+cpS5s/CtHCtdOH17JqZnqwC7thqE2UCK5tpBkDbH Kj64eDwabdKArAfzI8X+ =/EBo -END PGP SIGNATURE- Mehdi Dogguy (6): Imported Upstream version 1.9.2 Merge tag 'upstream/1.9.2' New upstream release Remove all patches, integrated upstream. Fix space/tab issue in viewer/Makefile Release to unstable --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] 03/06: New upstream release
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst. commit 0688ebd22e2831430978cb06f52298321522dd6a Author: Mehdi DogguyDate: Wed Feb 10 19:08:51 2016 +0100 New upstream release --- debian/changelog | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0aaa669..9fcbd8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +coinst (1.9.2-1) UNRELEASED; urgency=medium + + * New upstream release: +- Avoid ambiguous output when package has multiple versions + (Closes: #759476) +- Add a new line before "LARGER NON-INSTALLABLE SETS" + (Closes: #759474) +- Use http.debian.net and allow user to specify source mirror by + passing --source flag (Closes: #736910) + + -- Mehdi Dogguy Wed, 10 Feb 2016 18:58:01 +0100 + coinst (1.9.1-2) unstable; urgency=medium * Fix FTBFS with OCaml 4.02.3 @@ -11,8 +23,8 @@ coinst (1.9.1-1) unstable; urgency=low * Update debian/gbp.conf to automatically filter out the "Talks" directory upon import using git-import-orig. * Import new upstream (minor) release -- Remove no longer needed 0001-Fixed-to-compile-with-OCaml-4.01.patch -- Update patch make_byte +- Remove no longer needed 0001-Fixed-to-compile-with-OCaml-4.01.patch +- Update patch make_byte -- Mehdi Dogguy Fri, 17 Jan 2014 22:51:09 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] 02/06: Merge tag 'upstream/1.9.2'
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst. commit 598ffa7f8dbb7e59c899222968b31b26aaf97821 Merge: cc96dbb 63c5a05 Author: Mehdi DogguyDate: Wed Feb 10 18:28:17 2016 +0100 Merge tag 'upstream/1.9.2' Upstream version 1.9.2 .gitignore| 5 +- BUGS.txt | 6 -- CHANGES | 18 ++ Makefile | 30 -- TODO.txt | 24 bytearray.ml | 28 - bytearray.mli | 8 +-- cache.ml | 8 +-- coinst.ml | 47 ++- deb_lib.ml| 86 +-- file.ml | 6 +- layout.ml | 55 - man/comigrate.1 | 11 +++- ptset.ml | 11 +++- ptset.mli | 2 + quotient.ml | 4 +- rpm_lib.ml| 20 --- solver.ml | 4 +- task.ml | 10 ++-- transition.ml | 174 +++--- update_data.ml| 7 ++- update_data.mli | 2 + upgrade_common.ml | 2 +- util.ml | 63 +++- util.mli | 4 +- viewer/Makefile | 13 +++- 26 files changed, 393 insertions(+), 255 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] 05/06: Fix space/tab issue in viewer/Makefile
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst. commit 08b4fcd112631f48f8dba870b753c05057461d40 Author: Mehdi DogguyDate: Fri Feb 12 00:12:07 2016 +0100 Fix space/tab issue in viewer/Makefile --- debian/changelog| 2 ++ .../0001-Fix-a-space-tab-issue-in-Makefile.patch| 21 + debian/patches/series | 1 + 3 files changed, 24 insertions(+) diff --git a/debian/changelog b/debian/changelog index f0205cb..5ac888f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ coinst (1.9.2-1) UNRELEASED; urgency=medium - Use http.debian.net and allow user to specify source mirror by passing --source flag (Closes: #736910) * Remove all patches, integrated upstream. + * Fix space/tab issue in viewer/Makefile +- add debian/patches/0001-Fix-a-space-tab-issue-in-Makefile.patch -- Mehdi Dogguy Wed, 10 Feb 2016 18:58:01 +0100 diff --git a/debian/patches/0001-Fix-a-space-tab-issue-in-Makefile.patch b/debian/patches/0001-Fix-a-space-tab-issue-in-Makefile.patch new file mode 100644 index 000..47873c0 --- /dev/null +++ b/debian/patches/0001-Fix-a-space-tab-issue-in-Makefile.patch @@ -0,0 +1,21 @@ +From: Mehdi Dogguy +Date: Fri, 12 Feb 2016 00:11:14 +0100 +Subject: Fix a space/tab issue in Makefile + +--- + viewer/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/viewer/Makefile b/viewer/Makefile +index b6915e8..5153664 100644 +--- a/viewer/Makefile b/viewer/Makefile +@@ -28,7 +28,7 @@ coinst_viewer: $(OBJS) + $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ + + coinst_viewer.byte: $(OBJS:.cmx=.cmo) +- $(OCAMLC) -o $@ $(OPTLINKFLAGS) $^ ++ $(OCAMLC) -o $@ $(OPTLINKFLAGS) $^ + + coinst_converter: $(CONVERTER) + $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ diff --git a/debian/patches/series b/debian/patches/series index e69de29..ad920cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-a-space-tab-issue-in-Makefile.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] branch upstream updated (cfa2c3b -> 63c5a05)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch upstream in repository coinst. from cfa2c3b Imported Upstream version 1.9.1 new 63c5a05 Imported Upstream version 1.9.2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore| 5 +- BUGS.txt | 6 -- CHANGES | 18 ++ Makefile | 30 -- TODO.txt | 24 bytearray.ml | 28 - bytearray.mli | 8 +-- cache.ml | 8 +-- coinst.ml | 47 ++- deb_lib.ml| 86 +-- file.ml | 6 +- layout.ml | 55 - man/comigrate.1 | 11 +++- ptset.ml | 11 +++- ptset.mli | 2 + quotient.ml | 4 +- rpm_lib.ml| 20 --- solver.ml | 4 +- task.ml | 10 ++-- transition.ml | 174 +++--- update_data.ml| 7 ++- update_data.mli | 2 + upgrade_common.ml | 2 +- util.ml | 63 +++- util.mli | 4 +- viewer/Makefile | 13 +++- 26 files changed, 393 insertions(+), 255 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git ___ 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] [coinst] 04/06: Remove all patches, integrated upstream.
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst. commit 87f8f00940407755e2ea21bdd07472623b0ff13a Author: Mehdi DogguyDate: Wed Feb 10 19:22:34 2016 +0100 Remove all patches, integrated upstream. --- debian/changelog| 1 + debian/patches/make_byte| 48 - debian/patches/make_clean | 27 --- debian/patches/make_viewer_byte | 37 --- debian/patches/ocaml_4.02.3 | 45 -- debian/patches/series | 4 6 files changed, 1 insertion(+), 161 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9fcbd8f..f0205cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ coinst (1.9.2-1) UNRELEASED; urgency=medium (Closes: #759474) - Use http.debian.net and allow user to specify source mirror by passing --source flag (Closes: #736910) + * Remove all patches, integrated upstream. -- Mehdi Dogguy Wed, 10 Feb 2016 18:58:01 +0100 diff --git a/debian/patches/make_byte b/debian/patches/make_byte deleted file mode 100644 index 2855496..000 --- a/debian/patches/make_byte +++ /dev/null @@ -1,48 +0,0 @@ a/Makefile -+++ b/Makefile -@@ -18,25 +18,43 @@ -repository.cmx quotient.cmx conflicts.cmx graph.cmx coinst_common.cmx - COMPFLAGS=-package unix,str,bigarray,cudf -g -I viewer - OPTLINKFLAGS=$(COMPFLAGS) -linkpkg -+BYTELINKFLAGS=$(OPTLINKFLAGS) -dllib -lbytearray_stubs -cclib -lbytearray_stubs -dllib -ltask_stubs -cclib -ltask_stubs - - OCAMLDEP=ocamlfind ocamldep - DEPFLAGS = -package js_of_ocaml,js_of_ocaml.syntax -syntax camlp4o -I viewer - - all: $(COINST) $(UPGRADE) $(TRANS) -+opt: all -+byte: dllbytearray_stubs.so dlltask_stubs.so $(COINST).byte $(UPGRADE).byte $(TRANS).byte -+ -+dllbytearray_stubs.so: bytearray_stubs.o -+ ocamlmklib -o bytearray_stubs $^ -+ -+dlltask_stubs.so: task_stubs.o -+ ocamlmklib -o task_stubs $^ - - $(COINST): $(OBJS) cudf_lib.cmx coinst_json.cmx coinst.cmx - $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ $(LINKFLAGS) - --$(COINST).byte: $(OBJS:.cmx=.cmo) cudf_lib.cmo coinst.cmo -- $(OCAMLC) -o $@ $(OPTLINKFLAGS) $^ $(LINKFLAGS) -+$(COINST).byte: $(OBJS:.cmx=.cmo) cudf_lib.cmo coinst_json.cmo coinst.cmo -+ $(OCAMLC) -o $@ $(BYTELINKFLAGS) $^ $(LINKFLAGS) -+ cp $@ $(COINST) - - - $(UPGRADE): $(OBJS) $(TASK) $(SVG) upgrade_common.cmx upgrade.cmx upgrade_main.cmx - $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ $(LINKFLAGS) - -+$(UPGRADE).byte: $(OBJS:.cmx=.cmo) $(TASK:.cmx=.cmo) $(SVG:.cmx=.cmo) upgrade_common.cmo upgrade.cmo upgrade_main.cmo -+ $(OCAMLC) -o $@ $(BYTELINKFLAGS) $^ $(LINKFLAGS) -+ cp $@ $(UPGRADE) -+ - $(TRANS): $(OBJS) $(TASK) $(SVG) update_data.cmx upgrade_common.cmx upgrade.cmx horn.cmx transition.cmx - $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ $(LINKFLAGS) - -+$(TRANS).byte: $(OBJS:.cmx=.cmo) $(TASK:.cmx=.cmo) $(SVG:.cmx=.cmo) update_data.cmo upgrade_common.cmo upgrade.cmo horn.cmo transition.cmo -+ $(OCAMLC) -o $@ $(BYTELINKFLAGS) $^ $(LINKFLAGS) -+ cp $@ $(TRANS) -+ - clean:: - rm -f $(COINST) $(UPGRADE) $(TRANS) $(COINST).byte $(UPGRADE).byte $(TRANS).byte - diff --git a/debian/patches/make_clean b/debian/patches/make_clean deleted file mode 100644 index 3487e60..000 --- a/debian/patches/make_clean +++ /dev/null @@ -1,27 +0,0 @@ -Author: Ralf Treinen -Description: remove all generated files in clean target - a/viewer/Makefile -+++ b/viewer/Makefile -@@ -38,8 +38,9 @@ - rm -f dot_parser.ml dot_parser.mli dot_lexer.ml - - clean:: -- rm -f coinst_converter coinst_viewer -+ rm -f coinst_converter coinst_viewer coinst_viewer.byte - rm -f jsviewer.js jsviewer.byte -+ rm -f dot_lexer.ml dot_parser.ml - - # - a/Makefile -+++ b/Makefile -@@ -38,7 +38,7 @@ - $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ $(LINKFLAGS) - - clean:: -- rm -f $(COINST) $(UPGRADE) $(TRANS) -+ rm -f $(COINST) $(UPGRADE) $(TRANS) $(COINST).byte $(UPGRADE).byte $(TRANS).byte - - # - diff --git a/debian/patches/make_viewer_byte b/debian/patches/make_viewer_byte deleted file mode 100644 index e4c3070..000 --- a/debian/patches/make_viewer_byte +++ /dev/null @@ -1,37 +0,0 @@ -Author: Ralf Treinen -Description: add target for building viewer in bytecode -Debian-bug: #656730 - a/viewer/Makefile -+++ b/viewer/Makefile -@@ -21,13 +21,21 @@ - LINKFLAGS=-package js_of_ocaml -linkpkg - - all: coinst_viewer jsviewer.js coinst_converter -+opt: all -+byte: coinst_viewer.byte jsviewer.js coinst_converter.byte - - coinst_viewer: $(OBJS) - $(OCAMLOPT) -o $@ $(OPTLINKFLAGS) $^ - -+coinst_viewer.byte: $(OBJS:.cmx=.cmo) -+ $(OCAMLC) -o $@ $(OPTLINKFLAGS) $^ -+ -
[Pkg-ocaml-maint-commits] [cppo] branch master updated (0091f95 -> e8aa52d)
This is an automated email from the git hooks/post-receive script. bengen pushed a change to branch master in repository cppo. from 0091f95 Install native libraries where available adds e8aa52d 1.3.1-2: Upload to unstable No new revisions were added by this update. Summary of changes: debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.git ___ 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] [cppo] 01/01: 1.3.1-2: Upload to unstable
This is an automated email from the git hooks/post-receive script. bengen pushed a commit to annotated tag debian/1.3.1-2 in repository cppo. commit e8aa52db260786199050d0ddf7ca5e379c3a2d0b Author: Hilko BengenDate: Fri Feb 12 00:34:11 2016 +0100 1.3.1-2: Upload to unstable --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ecd707b..ff7a91b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -cppo (1.3.1-2) UNRELEASED; urgency=medium +cppo (1.3.1-2) unstable; urgency=medium * Team upload - * Install native libraries where available + * Install native libraries where available (Closes: #813885) - -- Hilko Bengen Sat, 06 Feb 2016 00:32:54 +0100 + -- Hilko Bengen Fri, 12 Feb 2016 00:34:00 +0100 cppo (1.3.1-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.git ___ 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] [cppo] annotated tag debian/1.3.1-2 created (now fdb37ba)
This is an automated email from the git hooks/post-receive script. bengen pushed a change to annotated tag debian/1.3.1-2 in repository cppo. at fdb37ba (tag) tagging e8aa52db260786199050d0ddf7ca5e379c3a2d0b (commit) replaces debian/1.3.1-1 tagged by Hilko Bengen on Fri Feb 12 00:44:34 2016 +0100 - Log - cppo Debian release 1.3.1-2 Hilko Bengen (2): Install native libraries where available 1.3.1-2: Upload to unstable --- This annotated tag includes the following new commits: new e8aa52d 1.3.1-2: Upload to unstable The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.git ___ 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