[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 2 commits - setup_native/source sysui/CustomTarget_deb.mk

[Andras Timar]

 setup_native/source/packinfo/packinfo_office.txt     |    6 --
 setup_native/source/packinfo/shellscripts_module.txt |   51 -------------------
 sysui/CustomTarget_deb.mk                            |    1 
 3 files changed, 1 insertion(+), 57 deletions(-)

New commits:
commit 22e904c70b195e32425c2ff201558041ce5b4d91
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Oct 17 20:13:45 2015 +0200

    deb system integration postinst and postrm scripts are not needed here
    
    ... because special 'debian-menus' package from sysui module does the job
    We do not have these scripts in rpm packages, let's not have them in deb
    packages, too.
    
    Change-Id: Iae7e996c3c3a8c1fb40977436773829a16e93fee
    (cherry picked from commit f8f1a0645106a02a926e96d61f5a55c0e8e41a7b)

diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index d1f848b..2b19fe1 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -101,7 +101,6 @@ End
 
 Start
 module = "gid_Module_Prg_Wrt_Bin"
-script = "shellscripts_module.txt"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
@@ -117,7 +116,6 @@ End
 
 Start
 module = "gid_Module_Prg_Calc_Bin"
-script = "shellscripts_module.txt"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-calc"
@@ -133,7 +131,6 @@ End
 
 Start
 module = "gid_Module_Prg_Draw_Bin"
-script = "shellscripts_module.txt"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-draw"
@@ -149,7 +146,6 @@ End
 
 Start
 module = "gid_Module_Prg_Impress_Bin"
-script = "shellscripts_module.txt"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
@@ -165,7 +161,6 @@ End
 
 Start
 module = "gid_Module_Prg_Base_Bin"
-script = "shellscripts_module.txt"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
@@ -181,7 +176,6 @@ End
 
 Start
 module = "gid_Module_Prg_Math_Bin"
-script = "shellscripts_module.txt"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-math"
diff --git a/setup_native/source/packinfo/shellscripts_module.txt b/setup_native/source/packinfo/shellscripts_module.txt
deleted file mode 100644
index 4b3bd88..0000000
--- a/setup_native/source/packinfo/shellscripts_module.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-%format deb
-
-%postinstall << END
-if [ "$$1" = "configure" ] ; then
-  # update desktop database
-  if [ -x /usr/bin/update-desktop-database ]; then
-    update-desktop-database -q /usr/share/applications
-  fi
-  # update debian style menus
-  if [ -x /usr/bin/update-menus ]; then
-    update-menus
-  fi
-fi
-exit 0
-END
-
-%postremove << END
-if [ "$$1" != "purge" ]
-then
-  if [ -x /usr/bin/update-desktop-database ]
-  then
-    update-desktop-database -q /usr/share/applications
-  fi
-  if [ -x /usr/bin/update-menus ]
-  then
-    update-menus
-  fi
-fi
-exit 0
-END
-
-%format all
-
commit 4fbc5d360600cc6251adb6d115fa29f773257bb2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Oct 17 20:03:22 2015 +0200

    PREFIXDIR must be /usr for .deb system integration package
    
    ... tools don't find *.desktop files in /usr/local or elsewhere,
    and the applications will not be registered in menus. Fixed the
    regression from d2cc121e0798a007a6e0409b09c16ce747ab959f
    
    Change-Id: I679b98b5cd0a502553fb13025ee8b9ac4bb5507e
    (cherry picked from commit eb911d69221a5491e75ab0ea47985535a0102aad)

diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index ea68e2f..8a48894 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -46,6 +46,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge
 		ICON_PREFIX=$(UNIXFILENAME.$*) \
 		KDEMAINDIR=/usr \
 		GNOMEDIR=/usr \
+		PREFIXDIR=/usr \
 		./create_tree.sh
 	sed $(deb_SRCDIR)/openoffice.org-debian-menus \
 		-e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \