121968: further changes for the creation of debian packages in order to get them…

121968: further changes for the creation of debian packages in order to get them installed when a former AOO resp. OOo version is installed.

solenv/bin/modules/installer/epmfile.pm

@@ -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);
             }
         }

sysui/desktop/debian/control

@@ -2,5 +2,5 @@ Description: %productname desktop integration
 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