[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc

[Andras Timar]

 solenv/inc/minor.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbf5ee6d3bf825656e8b0246dc3baf85ce6b63e0
Author: Andras Timar ati...@suse.com
Date:   Thu Jan 5 13:34:32 2012 +0100

Bump year

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index ac419ee..81bc6be 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -8,4 +8,4 @@ VERSIONMAJOR=3
 VERSIONMINOR=5
 VERSIONMICRO=0
 
-COPYRIGHTYEARRANGE=2000-2011
+COPYRIGHTYEARRANGE=2000-2012
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc

[Lionel Elie Mamane]

 solenv/inc/tg_ext.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f7c0526a120711b02ad69b68fd254fcd8f5e0f09
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Dec 9 00:54:46 2011 +0100

tg_ext.ml: fix patch when filename ambiguous

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a6335a5..1ab9dc6 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -194,9 +194,9 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : 
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE  # $(PATCH_FILES)==none ||   $(PATCH_FILES)==
 .IF $(GUI)==WNT
-$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p3 )  $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p2 )  $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE   # $(GUI)==WNT
-$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p3 )  $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p2 )  $(TOUCH) $(PATCH_FLAG_FILE)
 .ENDIF  # $(GUI)==WNT
 .ENDIF # $(PATCH_FILES)==none ||   $(PATCH_FILES)==
 .IF $(T_ADDITIONAL_FILES)!=
@@ -306,10 +306,10 @@ $(MISC)/$(TARFILE_ROOTDIR).done : 
$(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
 #.IF $(my4ver:s/.//:s/,//) = 300
 #  $(COMMAND_ECHO)cd $(MISC)  ( $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | patch 
$(PATCHFLAGS) -p2 )
 #.ELSE # $(my4ver:s/.//:s/,//) = 300
-$(COMMAND_ECHO)cd $(MISC)  $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC)  $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | (cd 
.$(fake_root_dir)  patch $(PATCHFLAGS) -p2 )
 #.ENDIF# $(my4ver:s/.//:s/,//) = 300
 .ELSE   # $(GUI)==WNT
-$(COMMAND_ECHO)cd $(MISC)  $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC)  $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir)  
$(GNUPATCH) $(PATCHFLAGS) -p2 )
 .ENDIF  # $(GUI)==WNT
 .IF $(CONVERTFILES)!=
 $(COMMAND_ECHO)$(CONVERT) dos  $(foreach,i,$(CONVERTFILES) 
$(MISC)/$(TARFILE_ROOTDIR)/$i)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc

[Miklos Vajna]

 solenv/inc/langlist.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8d5bdf2913852f4c14d8e09cbeed05684a1ce4b7
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 6 20:06:33 2011 +0100

langlist.mk: remove bogus Turkmen language

This was added in cbf182a975dd170aa4997677ac3516ade4cb30a7, but
scp2/source/ooo/module_langpack.ulf was never updated accordingly, nor
there is such a language on Pootle.
(cherry picked from commit 0d5b38240caf03323d9a180811653eb38eaf7f48)

diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 8a79b15..f044711 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -121,7 +121,6 @@ ta \
 te \
 tg \
 th \
-tk \
 tn \
 tr \
 ts \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits