[X2Go-Commits] [pale-moon] 39/47: debian/control.in: move Replaces line up for palemoon bin-pkg.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit 3270305568bd9302ccd8c70bfef97958655445f4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Sep 22 01:22:07 2018 +0200

    debian/control.in: move Replaces line up for palemoon bin-pkg.
---
 debian/changelog  | 1 +
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1c3df66..4526663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add suggestions copied from Debian's Firefox package.
     - Add conflicts from Debian's Firefox package, merged-in with the already
       existing ones.
+    - Move Replaces line up for palemoon bin-pkg.
   * debian/rules:
     - Tabbify.
     - Add dh_testdir protection. Debian's firefox(-esr) package uses it.
diff --git a/debian/control.in b/debian/control.in
index 813b1d0..4503a35 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -116,8 +116,8 @@ Conflicts: j2re1.4,
            pango-graphite (<< 0.9.3),
 # Palemoon-specific conflicts.
            palemoon-nonsse2,
-Provides: x-www-browser
 Replaces: palemoon-nonsse2
+Provides: x-www-browser
 Description: Firefox-based, efficient and easy to use web browser
  Pale Moon offers selected features and optimizations to maximize
  the browser's speed, stability and user experience, while maintaining

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git