[Pkg-mozext-commits] [SCM] Firefox plugin to add a Amazon Tracking ID to Amazon branch, topic/fsfe/debian, updated. topic/fsfe/debian/1.11-2-3-g05490f5

[Sascha Girrulat]

The following commit has been merged in the topic/fsfe/debian branch:
commit 65e37efba1761016a6f3d72f96f5e65496064b20
Author: Sascha Girrulat <sascha at girrulat.de>
Date:   Sun Nov 13 10:27:06 2011 +0100

    add conflict to standard xul-ext-affiliatefox

diff --git a/debian/control b/debian/control
index 4eba252..99b9672 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Homepage: http://wiki.fsfe.org/SupportPrograms
 Package: xul-ext-affiliatefox-fsfe
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: xul-ext-affiliatefox
 Recommends: ${xpi:Recommends}
 Enhances: ${xpi:Enhances}
 Provides: ${xpi:Provides}

-- 
Firefox plugin to add a Amazon Tracking ID to Amazon