[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging branch, master, updated. debian/2.0.3a-1-8-gbd1203b

2012-03-17 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit bd1203b9ff576af6c8d5e9d26b4c5d202aef26ff
Author: Stephane Glondu 
Date:   Sat Mar 17 11:42:54 2012 +0100

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index dc55b7b..4cce2a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ocsigenserver (2.0.4-1) UNRELEASED; urgency=low
+ocsigenserver (2.0.4-1) unstable; urgency=low
 
   * New upstream release
+  * Fix FTBFS with bash as /bin/sh
 
- -- Stéphane Glondu   Sat, 17 Mar 2012 11:40:41 +0100
+ -- Stéphane Glondu   Sat, 17 Mar 2012 11:42:51 +0100
 
 ocsigenserver (2.0.3a-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.0.3a-1-8-gbd1203b

2012-03-17 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 73ea98729c84339a7431e4edb01ed8e93d91df6b
Author: Stephane Glondu 
Date:   Sat Mar 17 11:57:04 2012 +0100

Fix typo in Makefile (caused FTBFS with /bin/sh -> bash)

diff --git a/debian/patches/0001-Fix-typo-in-Makefile.patch 
b/debian/patches/0001-Fix-typo-in-Makefile.patch
new file mode 100644
index 000..bf0ccdb
--- /dev/null
+++ b/debian/patches/0001-Fix-typo-in-Makefile.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu 
+Date: Sat, 17 Mar 2012 11:56:53 +0100
+Subject: Fix typo in Makefile (caused FTBFS with /bin/sh -> bash)
+
+---
+ Makefile |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4ffb01..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
new file mode 100644
index 000..298bee5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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

[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging branch, master, updated. debian/2.0.3a-1-8-gbd1203b

2012-03-17 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 6bfdd2aab901cab66fb67df24daa888aca1c39c9
Author: Stephane Glondu 
Date:   Sat Mar 17 11:41:47 2012 +0100

Remove patch applied upstream

diff --git a/debian/patches/0001-Fix-upstream-install-target.patch 
b/debian/patches/0001-Fix-upstream-install-target.patch
deleted file mode 100644
index 9204be9..000
--- a/debian/patches/0001-Fix-upstream-install-target.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Pierre Chambart 
-Date: Wed, 1 Feb 2012 16:44:08 +0100
-Subject: Fix upstream install target
-
-Signed-off-by: Stephane Glondu 

- Makefile |3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 302e350..e4ffb01 100644
 a/Makefile
-+++ b/Makefile
-@@ -93,7 +93,8 @@ install.files:
-   $(INSTALL) -d -m 755 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
- $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
-   $(INSTALL) -m 644 -o ${OCSIGENUSER} -g ${OCSIGENGROUP} \
--local/var/www/ocsigenstuff/* $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
-+local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \
-+$(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
-   $(INSTALL) -d -m 755 $(TEMPROOT)$(MANDIR)
-   $(INSTALL) -m 644 src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a66d249..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-upstream-install-target.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

[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging branch, master, updated. debian/2.0.3a-1-8-gbd1203b

2012-03-17 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit c3e593edf9fa7e5ffe04d8d6c2a259f4e00cd331
Author: Stephane Glondu 
Date:   Sat Mar 17 11:40:56 2012 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index e7a0a41..dc55b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocsigenserver (2.0.4-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu   Sat, 17 Mar 2012 11:40:41 +0100
+
 ocsigenserver (2.0.3a-1) unstable; urgency=low
 
   * New upstream release

-- 
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.0.3a-1-8-gbd1203b

2012-03-17 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 94566f0b5f63a6e0784399d6a0027202d25db326
Merge: 149f9c7c45de425c7fef01e3d699c952304af1e6 
c5fc5a2b446ce70652a3a2387c73f0c6249906d2
Author: Stephane Glondu 
Date:   Sat Mar 17 11:40:34 2012 +0100

Merge tag 'upstream/2.0.4'

Upstream version 2.0.4


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