OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Sep-2006 15:20:34
Branch: HEAD Handle: 2006091014203301
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
now that the OpenDocument stuff is officially registered at IANA (see
http://www.iana.org/assignments/media-types/application/), add the
MIME types to Apache's mime.types database
Summary:
Revision Changes Path
1.24 +29 -3 openpkg-src/apache/apache.patch
1.350 +1 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.23 -r1.24 apache.patch
--- openpkg-src/apache/apache.patch 28 Jul 2006 06:09:19 -0000 1.23
+++ openpkg-src/apache/apache.patch 10 Sep 2006 13:20:33 -0000 1.24
@@ -1,6 +1,32 @@
+Index: apache_1.3.37/conf/mime.types
+--- apache_1.3.37/conf/mime.types.orig 2004-11-24 20:10:19 +0100
++++ apache_1.3.37/conf/mime.types 2006-09-10 14:51:11 +0200
+@@ -265,6 +265,22 @@
+ application/vnd.novadigm.edm
+ application/vnd.novadigm.edx
+ application/vnd.novadigm.ext
++application/vnd.oasis.opendocument.text odt
++application/vnd.oasis.opendocument.spreadsheet ods
++application/vnd.oasis.opendocument.presentation odp
++application/vnd.oasis.opendocument.graphics odg
++application/vnd.oasis.opendocument.chart odc
++application/vnd.oasis.opendocument.formula odf
++application/vnd.oasis.opendocument.image odi
++application/vnd.oasis.opendocument.text-template ott
++application/vnd.oasis.opendocument.spreadsheet-template ots
++application/vnd.oasis.opendocument.presentation-template otp
++application/vnd.oasis.opendocument.graphics-template otg
++application/vnd.oasis.opendocument.chart-template otc
++application/vnd.oasis.opendocument.formula-template oft
++application/vnd.oasis.opendocument.image-template oti
++application/vnd.oasis.opendocument.text-master odm
++application/vnd.oasis.opendocument.text-web oth
+ application/vnd.obn
+ application/vnd.osa.netdeploy
+ application/vnd.palm
Index: apache_1.3.37/configure
--- apache_1.3.37/configure.orig 2006-07-12 10:16:05 +0200
-+++ apache_1.3.37/configure 2006-07-28 08:07:56 +0200
++++ apache_1.3.37/configure 2006-09-10 14:49:50 +0200
@@ -1175,10 +1175,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -18,7 +44,7 @@
## check and debug
Index: apache_1.3.37/src/Configure
--- apache_1.3.37/src/Configure.orig 2006-07-12 10:16:05 +0200
-+++ apache_1.3.37/src/Configure 2006-07-28 08:07:56 +0200
++++ apache_1.3.37/src/Configure 2006-09-10 14:49:50 +0200
@@ -1158,14 +1158,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -79,7 +105,7 @@
####################################################################
Index: apache_1.3.37/src/main/util_script.c
--- apache_1.3.37/src/main/util_script.c.orig 2006-07-12 10:16:05
+0200
-+++ apache_1.3.37/src/main/util_script.c 2006-07-28 08:07:56 +0200
++++ apache_1.3.37/src/main/util_script.c 2006-09-10 14:49:50 +0200
@@ -204,6 +204,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.349 -r1.350 apache.spec
--- openpkg-src/apache/apache.spec 9 Sep 2006 07:44:20 -0000 1.349
+++ openpkg-src/apache/apache.spec 10 Sep 2006 13:20:34 -0000 1.350
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060909
+Release: 20060910
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
