diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-06 13:05:26 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-06 13:05:26 -0500 |
| commit | 801936459fa8cd5d452f875d14da7f34a9117f08 (patch) | |
| tree | b68a8d557f97d432db6933f487ebdff842eee600 /tomcat/tomcat.patch | |
| parent | bf202438d88e650b69c9817f003f45aed1f58996 (diff) | |
| parent | f8c7607ea291d7e7d976a9485abc1761627eb654 (diff) | |
Merge remote branch 'extensions/master'MELD_LIBREOFFICE_REPOS
* extensions/master: (978 commits)
get this building for me
Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
enable l10n of presenter screen
oops Bjoern's .gitattributes link got commited by mistake
enable l10n of presenter screen
Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
poppler 0.17.0 changed its api for no some reason or other
Branch libreoffice-3-4-2
Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
Remove component_getImplementationEnvironment
hotfix to include localizations of Presenter screen extension
hotfix to include localizations of Presenter screen extension
Goodbye to CWS_WORK_STAMP
use OString::equalsL
fixing rebase errors
ause130: #i117218# change .idl handling to gnu make
CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]
Use DESKTOP and NATIVE where appropriate
Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
...
Diffstat (limited to 'tomcat/tomcat.patch')
| -rw-r--r-- | tomcat/tomcat.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch new file mode 100644 index 000000000000..1815660b1b5b --- /dev/null +++ b/tomcat/tomcat.patch @@ -0,0 +1,35 @@ +--- misc/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 16:03:59 2008 ++++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 15:56:18 2008 +@@ -1,1 +1,31 @@ +-dummy ++<project name="jsr152 and jsr154 in Debian" default="debuild" basedir="."> ++ ++ <target name="debuild" ++ description="Build jsr154 and jsr152 for Debian (Default)"> ++ <echo message="Building Servlet 2.4 API"/> ++ <ant antfile="jsr154/build.xml" ++ target="dist" ++ inheritAll="false" ++ /> ++ <echo message="Building JSP 2.0 API"/> ++ <ant antfile="jsr152/build.xml" ++ target="dist" ++ inheritAll="false" ++ /> ++ </target> ++ ++ <target name="clean" description="Clean"> ++ <echo message="Cleaning JSP 2.0 API"/> ++ <ant antfile="jsr152/build.xml" ++ target="clean" ++ inheritAll="false" ++ /> ++ <echo message="Cleaning Servlet 2.4 API"/> ++ <ant antfile="jsr154/build.xml" ++ target="clean" ++ inheritAll="false" ++ /> ++ <delete dir="tmp"/> ++ </target> ++ ++</project> |