[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc3-1-10-ga0e23e4



The following commit has been merged in the debian-experimental-3.5 branch:
commit 81effae7851af4320b3a195407790667a93bb87a
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Feb 10 20:41:19 2012 +0000

    don't show rc3, it's not a rc anymore...

diff --git a/changelog b/changelog
index c6b047a..d1c0a79 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,11 @@
 libreoffice (1:3.5.0-1) UNRELEASED; urgency=low
 
-  * 3.5.0 final release (identical to rc3)
+  * LibreOffice 3.5.0 final release (identical to rc3)
 
- -- Rene Engelhard <rene@debian.org>  Fri, 10 Feb 2012 20:57:24 +0100
+  * debian/patches/no-rcX-in-final.diff: don't show rc3, it's not a rc
+    amymore...
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 10 Feb 2012 20:40:28 +0000
 
 libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
 
diff --git a/patches/no-rcX-in-final.diff b/patches/no-rcX-in-final.diff
new file mode 100644
index 0000000..777ac0f
--- /dev/null
+++ b/patches/no-rcX-in-final.diff
@@ -0,0 +1,128 @@
+--- a/instsetoo_native/util/openoffice.lst-old	2012-02-10 20:38:50.000000000 +0000
++++ b/instsetoo_native/util/openoffice.lst	2012-02-10 20:38:50.000000000 +0000
+@@ -53,13 +53,13 @@
+ 			PRODUCTVERSION 3.5
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+-			SHORT_PRODUCTEXTENSION rc3
++			SHORT_PRODUCTEXTENSION 
+             POSTVERSIONEXTENSION
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3.5
+ 			USERDIRPRODUCTVERSION 3
+ 			ABOUTBOXPRODUCTVERSION 3.5.0
+-			ABOUTBOXPRODUCTVERSIONSUFFIX rc3
++			ABOUTBOXPRODUCTVERSIONSUFFIX 
+ 			BASEPRODUCTVERSION 3.5
+             PCPFILENAME libreoffice.pcp
+ 			UPDATEURL http://update.libreoffice.org/check.php
+@@ -112,13 +112,13 @@
+ 			PRODUCTVERSION 3.5
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+-			SHORT_PRODUCTEXTENSION rc3
++			SHORT_PRODUCTEXTENSION 
+             POSTVERSIONEXTENSION
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3.5
+ 			USERDIRPRODUCTVERSION 3
+ 			ABOUTBOXPRODUCTVERSION 3.5.0
+-			ABOUTBOXPRODUCTVERSIONSUFFIX rc3
++			ABOUTBOXPRODUCTVERSIONSUFFIX 
+ 			BASEPRODUCTVERSION 3.5
+ 			UPDATEURL http://update.libreoffice.org/check.php
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+@@ -170,14 +170,14 @@
+ 			PRODUCTVERSION 3.5
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+-			SHORT_PRODUCTEXTENSION rc3
++			SHORT_PRODUCTEXTENSION 
+ 			UNIXBASISROOTNAME lodev3.5
+             POSTVERSIONEXTENSION
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3.5
+ 			USERDIRPRODUCTVERSION 3
+ 			ABOUTBOXPRODUCTVERSION 3.5.0
+-			ABOUTBOXPRODUCTVERSIONSUFFIX rc3
++			ABOUTBOXPRODUCTVERSIONSUFFIX 
+ 			BASEPRODUCTVERSION 3.5
+ 			DEVELOPMENTPRODUCT 1
+ 			BASISPACKAGEPREFIX lodevbasis
+@@ -240,7 +240,7 @@
+             PRODUCTEXTENSION
+             BRANDPACKAGEVERSION 3.5
+             LONG_PRODUCTEXTENSION
+-            SHORT_PRODUCTEXTENSION rc3
++            SHORT_PRODUCTEXTENSION 
+             LICENSENAME LGPL
+             SETSTATICPATH 1
+             NOVERSIONINDIRNAME 1
+@@ -275,7 +275,7 @@
+             PRODUCTVERSION 3.5
+             PRODUCTEXTENSION
+             LONG_PRODUCTEXTENSION
+-            SHORT_PRODUCTEXTENSION rc3
++            SHORT_PRODUCTEXTENSION 
+             POSTVERSIONEXTENSION SDK
+             POSTVERSIONEXTENSIONUNIX sdk
+             BRANDPACKAGEVERSION 3.5
+@@ -318,7 +318,7 @@
+             PRODUCTVERSION 3.5
+             PRODUCTEXTENSION
+             LONG_PRODUCTEXTENSION
+-            SHORT_PRODUCTEXTENSION rc3
++            SHORT_PRODUCTEXTENSION 
+             UNIXBASISROOTNAME lodev3.5
+             POSTVERSIONEXTENSION SDK
+             POSTVERSIONEXTENSIONUNIX sdk
+@@ -367,7 +367,7 @@
+             PRODUCTVERSION 3.5
+             PRODUCTEXTENSION
+             LONG_PRODUCTEXTENSION
+-            SHORT_PRODUCTEXTENSION rc3
++            SHORT_PRODUCTEXTENSION 
+             POSTVERSIONEXTENSION TEST
+             POSTVERSIONEXTENSIONUNIX test
+             BRANDPACKAGEVERSION 3.5
+@@ -410,7 +410,7 @@
+             PRODUCTVERSION 3.5
+             PRODUCTEXTENSION
+             LONG_PRODUCTEXTENSION
+-            SHORT_PRODUCTEXTENSION rc3
++            SHORT_PRODUCTEXTENSION 
+             UNIXBASISROOTNAME lodev3.5
+             POSTVERSIONEXTENSION TEST
+             POSTVERSIONEXTENSIONUNIX test
+@@ -458,13 +458,13 @@
+ 			PRODUCTVERSION 3.5
+ 			PRODUCTEXTENSION
+ 			LONG_PRODUCTEXTENSION
+-			SHORT_PRODUCTEXTENSION  rc3
++			SHORT_PRODUCTEXTENSION  
+             POSTVERSIONEXTENSION
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3.5
+ 			USERDIRPRODUCTVERSION 3
+ 			ABOUTBOXPRODUCTVERSION 3.5.0
+-			ABOUTBOXPRODUCTVERSIONSUFFIX rc3
++			ABOUTBOXPRODUCTVERSIONSUFFIX 
+ 			BASEPRODUCTVERSION 3.5
+             PCPFILENAME openoffice.pcp
+ 			UPDATEURL http://update.libreoffice.org/check.php
+@@ -522,13 +522,13 @@
+ 			PRODUCTVERSION 3.5
+ 			PRODUCTEXTENSION
+ 			LONG_PRODUCTEXTENSION
+-			SHORT_PRODUCTEXTENSION rc3
++			SHORT_PRODUCTEXTENSION 
+             POSTVERSIONEXTENSION
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3.5
+ 			USERDIRPRODUCTVERSION 3
+ 			ABOUTBOXPRODUCTVERSION 3.5.0
+-			ABOUTBOXPRODUCTVERSIONSUFFIX rc3
++			ABOUTBOXPRODUCTVERSIONSUFFIX 
+ 			BASEPRODUCTVERSION 3.5
+ 			UPDATEURL http://update.libreoffice.org/check.php
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
diff --git a/patches/series b/patches/series
index 041039f..04e23c9 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ disable-sc-sw-unoapi-subsequentcheck-for-now.diff
 SwTblBoxFormula-destructor.diff
 ia64-oox-size.diff
 mediwiki-oor-replace.diff
+no-rcX-in-final.diff

-- 
LibreOffice packaging repository


Reply to: