The following commit has been merged in the debian-experimental-3.5 branch:
commit 0235e539da605506f48a07f8f322419b3722362d
Author: Rene Engelhard <[email protected]>
Date: Tue Mar 13 00:05:21 2012 +0100
remove obsolete no-rcX-in-final.diff
diff --git a/patches/no-rcX-in-final.diff b/patches/no-rcX-in-final.diff
deleted file mode 100644
index 777ac0f..0000000
--- a/patches/no-rcX-in-final.diff
+++ /dev/null
@@ -1,128 +0,0 @@
---- 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 2591c75..89c75ed 100644
--- a/patches/series
+++ b/patches/series
@@ -24,7 +24,6 @@ add-debian-multiarch-support.diff
propagate-gb_FULLDEPS.diff
disable-sc-sw-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
-#no-rcX-in-final.diff
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
