[Pkg-mozext-commits] [SCM] Collection of development scripts used for XUL extensions. branch, master, updated. 0.23-57-g55869ff

Tue Oct 11 21:32:12 UTC 2011

The following commit has been merged in the master branch:
commit 55869ffc370604e71307910774169aaad154c0d4
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Oct 11 23:32:08 2011 +0200

    Move scripts and Python modules one level up to correct installation directory.

diff --git a/Makefile b/Makefile
index 7ebe77d..3d78412 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,6 @@ install:
 	python setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
 
 clean:
-	rm -rf build src/*.pyc
+	rm -rf build *.pyc
 
 .PHONY: build clean install test
diff --git a/src/xpi.mk b/data/xpi.mk
similarity index 100%
rename from src/xpi.mk
rename to data/xpi.mk
diff --git a/src/xul-app-data.csv.Debian b/data/xul-app-data.csv.Debian
similarity index 100%
rename from src/xul-app-data.csv.Debian
rename to data/xul-app-data.csv.Debian
diff --git a/src/xul-app-data.csv.Ubuntu b/data/xul-app-data.csv.Ubuntu
similarity index 100%
rename from src/xul-app-data.csv.Ubuntu
rename to data/xul-app-data.csv.Ubuntu
diff --git a/debian/copyright b/debian/copyright
index 6abb7fe..680d4db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,20 +24,20 @@ Copyright: 2007-2009, Sasa Bodiroza <jazzva at gmail.com>
            2007-2009, Fabien Tassin <fta at sofaraway.org>
 License: GPL-2+
 
-Files: man/xpi-pack.1 man/xpi-unpack.1
+Files: xpi-pack xpi-unpack
 Copyright: 2007-2009, Sasa Bodiroza <jazzva at gmail.com>
+           2007-2009, Alexander Sack <asac at ubuntu.com>
 License: GPL-2+
 
-Files: src/xpi.mk
+Files: data/xpi.mk
 Copyright: 2008-2009 Canonical Ltd.
 License: GPL-2+
 
-Files: src/xpi-pack src/xpi-unpack
+Files: man/xpi-pack.1 man/xpi-unpack.1
 Copyright: 2007-2009, Sasa Bodiroza <jazzva at gmail.com>
-           2007-2009, Alexander Sack <asac at ubuntu.com>
 License: GPL-2+
 
-Files: src/Buildsystem/xul_ext.pm src/Sequence/xul_ext.pm
+Files: perl/Debian/Buildsystem/xul_ext.pm perl/Debian/Sequence/xul_ext.pm
 Copyright: 2010, Mike Hommey <glandium at debian.org>
 License: GPL-2+
 
diff --git a/src/dh_xul-ext b/dh_xul-ext
similarity index 99%
rename from src/dh_xul-ext
rename to dh_xul-ext
index c7328de..e87fd6b 100755
--- a/src/dh_xul-ext
+++ b/dh_xul-ext
@@ -97,7 +97,7 @@ def _get_data_dir():
     if __file__.startswith("/usr/bin"):
         data_dir = "/usr/share/mozilla-devscripts"
     else:
-        data_dir = os.path.dirname(__file__)
+        data_dir = os.path.join(os.path.dirname(__file__), "data")
     return data_dir
 
 def get_vendor():
diff --git a/src/install-xpi b/install-xpi
similarity index 100%
rename from src/install-xpi
rename to install-xpi
diff --git a/src/moz-version b/moz-version
similarity index 100%
rename from src/moz-version
rename to moz-version
diff --git a/src/moz_version.py b/moz_version.py
similarity index 100%
rename from src/moz_version.py
rename to moz_version.py
diff --git a/src/Buildsystem/xul_ext.pm b/perl/Debian/Buildsystem/xul_ext.pm
similarity index 100%
rename from src/Buildsystem/xul_ext.pm
rename to perl/Debian/Buildsystem/xul_ext.pm
diff --git a/src/Sequence/xul_ext.pm b/perl/Debian/Sequence/xul_ext.pm
similarity index 100%
rename from src/Sequence/xul_ext.pm
rename to perl/Debian/Sequence/xul_ext.pm
diff --git a/setup.py b/setup.py
index ad48412..d5a2cf7 100644
--- a/setup.py
+++ b/setup.py
@@ -29,15 +29,15 @@ SCRIPTS = [
 if __name__ == '__main__':
     setup(name='mozilla-devscripts',
           version=get_debian_version(),
-          scripts=[os.path.join('src', s) for s in SCRIPTS],
-          py_modules=['src/moz_version'],
+          scripts=SCRIPTS,
+          py_modules=['moz_version'],
           data_files=[('share/doc/mozilla-devscripts', ['README']),
                       ('share/man/man1', glob.glob("man/*.1")),
                       ('share/mozilla-devscripts',
-                       ['src/xpi.mk'] + glob.glob('src/xul-app-data.csv.*')),
+                       ['data/xpi.mk'] + glob.glob('data/xul-app-data.csv.*')),
                       ('share/perl5/Debian/Debhelper/Buildsystem',
-                       ['src/Buildsystem/xul_ext.pm']),
+                       ['perl/Debian/Buildsystem/xul_ext.pm']),
                       ('share/perl5/Debian/Debhelper/Sequence',
-                       ['src/Sequence/xul_ext.pm']),
+                       ['perl/Debian/Sequence/xul_ext.pm']),
                      ],
     )
diff --git a/tests/dh_xul-ext/all/debian/rules b/tests/dh_xul-ext/all/debian/rules
index d69fe4a..78409f7 100755
--- a/tests/dh_xul-ext/all/debian/rules
+++ b/tests/dh_xul-ext/all/debian/rules
@@ -5,4 +5,4 @@
 
 override_dh_install:
 	dh_install install.rdf /usr/share/xul-ext/test-package/
-	../../../src/dh_xul-ext -a
+	../../../dh_xul-ext -a
diff --git a/tests/dh_xul-ext/all_environment/debian/rules b/tests/dh_xul-ext/all_environment/debian/rules
index e1630ab..738481a 100755
--- a/tests/dh_xul-ext/all_environment/debian/rules
+++ b/tests/dh_xul-ext/all_environment/debian/rules
@@ -5,4 +5,4 @@
 
 override_dh_install:
 	dh_install install.rdf /usr/share/xul-ext/test-package/
-	DH_XUL_EXT_VENDOR=all ../../../src/dh_xul-ext
+	DH_XUL_EXT_VENDOR=all ../../../dh_xul-ext
diff --git a/tests/dh_xul-ext/debian/debian/rules b/tests/dh_xul-ext/debian/debian/rules
index 2872153..26712f4 100755
--- a/tests/dh_xul-ext/debian/debian/rules
+++ b/tests/dh_xul-ext/debian/debian/rules
@@ -5,4 +5,4 @@
 
 override_dh_install:
 	dh_install install.rdf /usr/share/xul-ext/test-package/
-	DEB_VENDOR=Debian ../../../src/dh_xul-ext
+	DEB_VENDOR=Debian ../../../dh_xul-ext
diff --git a/tests/dh_xul-ext/ubuntu/debian/rules b/tests/dh_xul-ext/ubuntu/debian/rules
index 8893f54..692843b 100755
--- a/tests/dh_xul-ext/ubuntu/debian/rules
+++ b/tests/dh_xul-ext/ubuntu/debian/rules
@@ -5,4 +5,4 @@
 
 override_dh_install:
 	dh_install install.rdf /usr/share/xul-ext/test-package/
-	DH_XUL_EXT_VENDOR=Ubuntu ../../../src/dh_xul-ext
+	DH_XUL_EXT_VENDOR=Ubuntu ../../../dh_xul-ext
diff --git a/tests/test-moz-version b/tests/test-moz-version
index 3b787dc..fc47ab6 100755
--- a/tests/test-moz-version
+++ b/tests/test-moz-version
@@ -24,7 +24,7 @@ import getopt
 import os
 import sys
 
-sys.path.insert(1, os.path.abspath(os.path.dirname(sys.argv[0]) + "/../src"))
+sys.path.insert(1, os.path.abspath(os.path.dirname(sys.argv[0]) + "/.."))
 from moz_version import compare_versions
 
 # error codes
diff --git a/src/xpi-pack b/xpi-pack
similarity index 100%
rename from src/xpi-pack
rename to xpi-pack
diff --git a/src/xpi-repack b/xpi-repack
similarity index 100%
rename from src/xpi-repack
rename to xpi-repack
diff --git a/src/xpi-unpack b/xpi-unpack
similarity index 100%
rename from src/xpi-unpack
rename to xpi-unpack

-- 
Collection of development scripts used for XUL extensions.

