- drop support for deprecated MOZ_EXT_NAME and MOZ_XPI_MOZILLA_DIRS variable

  - update src/xpi.mk
* install-xpi:
  - Split xpi installation from xpi.mk into new install-xpi script.
    - add src/install-xpi
    - update src/Makefile
    - update src/xpi.mk
    - update debian/control

1 files changed, 6 insertions, 6 deletions

diff --git a/src/dh_xul-ext b/src/dh_xul-ext
index 39c10d8..0702447 100755
--- a/src/dh_xul-ext
+++ b/src/dh_xul-ext
@@ -110,16 +110,16 @@ def get_source_package_name():
 
 
 def get_provided_package_names(package, supported_apps):
+	ext_name = package
+	for prefix in ("firefox-", "iceweasel-", "mozilla-", "xul-ext-"):
+		if ext_name.startswith(prefix):
+			ext_name = ext_name[len(prefix):]
+
 	# check if MOZ_XPI_EXT_NAME is defined in debian/rules
 	lines = open("debian/rules").readlines()
-	lines = filter(lambda x: x.find("MOZ_XPI_EXT_NAME") != -1 or x.find("MOZ_EXT_NAME") != -1, lines)
+	lines = filter(lambda x: x.find("MOZ_XPI_EXT_NAME") != -1, lines)
 	if len(lines) > 0:
 		ext_name = lines[-1][line.find("=")+1:].strip()
-	else:
-		ext_name = package
-		for prefix in ("firefox-", "iceweasel-", "mozilla-", "xul-ext-"):
-			if ext_name.startswith(prefix):
-				ext_name = ext_name[len(prefix):]
 
 	provides = set()
 	provides.add("xul-ext-" + ext_name)