diff options
author | Caolán McNamara <cmc@openoffice.org> | 2010-02-25 10:40:45 +0000 |
---|---|---|
committer | Caolán McNamara <cmc@openoffice.org> | 2010-02-25 10:40:45 +0000 |
commit | e9f075785bbe4e1b9246328ef74ccbf9bd9e0f43 (patch) | |
tree | 1130e1532b38f7da8a1c9c59583894e4c1b19e33 /redland/rasqal | |
parent | cmcfixes72: #i109194# http://fedoraproject.org/wiki/UnderstandingDSOLinkChang... (diff) | |
parent | CWS-TOOLING: integrate CWS changefileheader2 (diff) | |
download | core-e9f075785bbe4e1b9246328ef74ccbf9bd9e0f43.tar.gz core-e9f075785bbe4e1b9246328ef74ccbf9bd9e0f43.zip |
cmcfixes72: merge with DEV300 m72
Diffstat (limited to 'redland/rasqal')
-rw-r--r-- | redland/rasqal/makefile.mk | 6 | ||||
-rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.dmake | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index d805761e5b5d..fc9e93baaa6d 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake index f79e38f33c2d..6795eb95c43d 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.dmake +++ b/redland/rasqal/rasqal-0.9.16.patch.dmake @@ -1,19 +1,15 @@ --- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008 +++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008 -@@ -1,1 +1,98 @@ +@@ -1,1 +1,94 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# -+# Copyright 2008 by Sun Microsystems, Inc. ++# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# -+# $RCSfile: rasqal-0.9.16.patch,v $ -+# -+# $Revision: 1.1.2.1 $ -+# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify |