openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1498474 - in /openoffice/trunk/main: solenv/bin/modules/installer/epmfile.pm sysui/desktop/debian/control
Date Mon, 01 Jul 2013 14:23:10 GMT
Author: orw
Date: Mon Jul  1 14:23:10 2013
New Revision: 1498474

URL: http://svn.apache.org/r1498474
Log:
121968: further changes for the creation of debian packages in order to get them installed
when a former AOO resp. OOo version is installed.

Modified:
    openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
    openoffice/trunk/main/sysui/desktop/debian/control

Modified: openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1498474&r1=1498473&r2=1498474&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm Mon Jul  1 14:23:10 2013
@@ -538,23 +538,13 @@ sub create_epm_header
 				if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; } # Debian allows no underline
in package name
 				$line = "%replaces" . " " . $onereplaces . "\n";
 				push(@epmheader, $line);
-
-				# Force the openofficeorg packages to get removed,
-				# see http://www.debian.org/doc/debian-policy/ch-relationships.html
-				# 7.5.2 Replacing whole packages, forcing their removal
-
-				if ( $installer::globals::debian )
-				{
-					$line = "%incompat" . " " . $onereplaces . "\n";
-					push(@epmheader, $line);
-				}
 			}
 
 			if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'}
eq 'openoffice' )
 			{
 				$line = "%provides" . " openoffice.org-unbundled\n";
 				push(@epmheader, $line);
-				$line = "%incompat" . " openoffice.org-bundled\n";
+				$line = "%replaces" . " openoffice.org-bundled\n";
 				push(@epmheader, $line);
 			}
 		}

Modified: openoffice/trunk/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/control?rev=1498474&r1=1498473&r2=1498474&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/control (original)
+++ openoffice/trunk/main/sysui/desktop/debian/control Mon Jul  1 14:23:10 2013
@@ -2,5 +2,5 @@ Description: %productname desktop integr
 Maintainer: Apache Software Foundation
 Architecture: all
 Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus,
openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus, openoffice.org-bundled,
openoffice.org-common



Mime
View raw message