Merge branch 'branch_0.13.0' into branch_0.13.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_13_0@4716 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/debian/control b/debian/control
index 479c295..e6decb8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libapache2-mod-chxj
 Priority: optional
 Maintainer: Atsushi Konno <konn@users.sourceforge.jp>
-Build-Depends: debhelper (>= 5.0.42), apache2-prefork-dev (>= 2.2.3-4), apache2-utils (>=2.2.3-4), apache2.2-common (>=2.2.3-4), autoconf, automake,libapr1 (>=1.2.7), libaprutil1 (>=1.2.7), libmagick9-dev (>=6.2.4.5-0.6), libmysqlclient15-dev (>=5.0.32)
+Build-Depends: debhelper (>= 5.0.42), apache2-prefork-dev (>= 2.2.3-4), apache2-utils (>=2.2.3-4), apache2.2-common (>=2.2.3-4), autoconf, automake,libapr1 (>=1.2.7), libaprutil1 (>=1.2.7), libmagick9-dev (>=6.2.4.5-0.6), libmysqlclient15-dev (>=5.0.32), openssl(>=0.9.8)
 Standards-Version: 3.6.2
 Section: libs
 
@@ -16,6 +16,6 @@ Description: CHTML to HDML,XHTML,JHTML convert module.
 Package: libapache2-mod-chxj
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2.3-4), apache2-prefork-dev (>= 2.2.3-4), apache2-utils (>= 2.2.3-4), apache2.2-common (>= 2.2.3-4), libapr1 (>= 1.2.7), libaprutil1 (>= 1.2.7), libmagick9-dev (>= 6.2.4.5-0.6), libmysqlclient15-dev (>= 5.0.32)
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.2.3-4), apache2-prefork-dev (>= 2.2.3-4), apache2-utils (>= 2.2.3-4), apache2.2-common (>= 2.2.3-4), libapr1 (>= 1.2.7), libaprutil1 (>= 1.2.7), libmagick9-dev (>= 6.2.4.5-0.6), libmysqlclient15-dev (>= 5.0.32), openssl(>=0.9.8)
 Description: CHTML to HDML,XHTML,JHTML convert module.
   The contents conversion middleware for domestic main carrying (three careers) is made as a module for Apache2.2. UserAgent is seen when contents made with CHTML are output and it converts it into HDML, XHTML, and JHTML (The image : to JPG, GIF, JPG, GIF from PNG, and PNG and BMP). With QR code generation function. 

diff --git a/support/centos/mod-chxj.spec.in b/support/centos/mod-chxj.spec.in
index 90cd240..73d2349 100644 (file)
--- a/support/centos/mod-chxj.spec.in
+++ b/support/centos/mod-chxj.spec.in
@@ -11,8 +11,8 @@ URL: http://sourceforge.jp/projects/modchxj/
 Source:  http://sourceforge.jp/projects/modchxj/downloads/33637/mod-chxj_%{version}.src.tar.gz
 Source1: http://download.tangent.org/libmemcached-0.23.tar.gz
 Packager:  Atsushi Konno <konn@sourceforge.jp>
-Requires: ImageMagick >= 6.2.8.0, httpd >= 2.2.3, apr >= 1.2.7, apr-util >= 1.2.7, mysql >= 5.0.45
-BuildPreReq: mysql-devel httpd-devel ImageMagick-devel gcc-c++ libtool
+Requires: ImageMagick >= 6.2.8.0, httpd >= 2.2.3, apr >= 1.2.7, apr-util >= 1.2.7, mysql >= 5.0.45, openssl >= 0.9.8
+BuildPreReq: mysql-devel httpd-devel ImageMagick-devel gcc-c++ libtool openssl-devel
 
 %description
 The contents conversion middleware for domestic main carrying (three careers)