[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging branch, master, updated. debian/2.1-1-5-g7c9937b
The following commit has been merged in the master branch: commit 6888bf0af2eaa5246bff937884d1a472866f3c6b Author: Stephane Glondu st...@glondu.net Date: Thu Dec 6 23:23:23 2012 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 3bcd9de..e539c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocsigenserver (2.2-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Thu, 06 Dec 2012 23:23:14 +0100 + ocsigenserver (2.1-1) unstable; urgency=low * New upstream release (Closes: #676750) -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.1-1-5-g7c9937b
The following commit has been merged in the master branch: commit ecec60d2a49d7290488efb0b3d313565acb0fc63 Merge: 3522a601612be36e405ca213b2fc6e61b50c15f7 33ab338a43a1dac2dd6b5f58ce2f8562e4f2d0cd Author: Stephane Glondu st...@glondu.net Date: Thu Dec 6 23:22:33 2012 +0100 Merge tag 'upstream/2.2' Upstream version 2.2 -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.1-1-5-g7c9937b
The following commit has been merged in the master branch: commit 7c9937b728b66e53937d690e7bfae07ed8d8a083 Author: Stephane Glondu st...@glondu.net Date: Thu Dec 6 23:29:53 2012 +0100 Update changelog and prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index e539c6b..763cb3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -ocsigenserver (2.2-1) UNRELEASED; urgency=low +ocsigenserver (2.2-1) experimental; urgency=low * New upstream release +- remove patch (merged upstream) - -- Stéphane Glondu glo...@debian.org Thu, 06 Dec 2012 23:23:14 +0100 + -- Stéphane Glondu glo...@debian.org Thu, 06 Dec 2012 23:29:42 +0100 ocsigenserver (2.1-1) unstable; urgency=low -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.1-1-5-g7c9937b
The following commit has been merged in the master branch: commit 6391ac4d9d0e95764e268041d225c14e373e63be Author: Stephane Glondu st...@glondu.net Date: Thu Dec 6 23:23:43 2012 +0100 Remove patch (merged upstream) diff --git a/debian/patches/0001-Fix-typo-in-Makefile.patch b/debian/patches/0001-Fix-typo-in-Makefile.patch deleted file mode 100644 index 38b1123..000 --- a/debian/patches/0001-Fix-typo-in-Makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stephane Glondu st...@glondu.net -Date: Sat, 17 Mar 2012 11:56:53 +0100 -Subject: Fix typo in Makefile - -Caused FTBFS with /bin/sh - bash. - Makefile |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7928b12..64923ae 100644 a/Makefile -+++ b/Makefile -@@ -138,7 +138,7 @@ logrotate: -| sed s%USER%$(OCSIGENUSER)%g \ -| sed s%GROUP%$(OCSIGENGROUP)%g \ -| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \ --$(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME) } -+$(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME) - - ### - --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 298bee5..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Fix-typo-in-Makefile.patch -- ocsigenserver 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