[X2Go-Commits] [pale-moon] 40/47: debian/control.in: add Break on xul-ext-torbutton.

git-admin at x2go.org git-admin at x2go.org
Sat Sep 22 01:51:27 CEST 2018


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

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

commit 9e3e8968363fb0050bf4dca5da152999874d3e00
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Sep 22 01:25:05 2018 +0200

    debian/control.in: add Break on xul-ext-torbutton.
---
 debian/changelog  | 1 +
 debian/control.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4526663..d3b3853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add conflicts from Debian's Firefox package, merged-in with the already
       existing ones.
     - Move Replaces line up for palemoon bin-pkg.
+    - Add Break on xul-ext-torbutton.
   * 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 4503a35..3a94c1f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -117,6 +117,7 @@ Conflicts: j2re1.4,
 # Palemoon-specific conflicts.
            palemoon-nonsse2,
 Replaces: palemoon-nonsse2
+Breaks: xul-ext-torbutton
 Provides: x-www-browser
 Description: Firefox-based, efficient and easy to use web browser
  Pale Moon offers selected features and optimizations to maximize

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


More information about the x2go-commits mailing list