---
debian/control | 2 +-
debian/openerp-web.links | 1 +
debian/patches/mochikit_system | 14 ++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 ++++++++-
5 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 debian/openerp-web.links
create mode 100644 debian/patches/mochikit_system
create mode 100644 debian/patches/series
diff --git a/debian/control b/debian/control
index 494c996..c3c9cce 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, adduser, python-beaker, python-cherrypy3,
python-formencode, python-mako, python-pybabel, python-pyparsing,
- python-simplejson
+ python-simplejson, libjs-mochikit
Recommends: openerp-server
Suggests: openerp-client
Description: Enterprise Resource Management (web frontend)
diff --git a/debian/openerp-web.links b/debian/openerp-web.links
new file mode 100644
index 0000000..74b771b
--- /dev/null
+++ b/debian/openerp-web.links
@@ -0,0 +1 @@
+usr/share/javascript/mochikit/MochiKit.js
usr/share/pyshared/openerp/static/javascript/MochiKit/MochiKit.js
diff --git a/debian/patches/mochikit_system b/debian/patches/mochikit_system
new file mode 100644
index 0000000..fb44e0e
--- /dev/null
+++ b/debian/patches/mochikit_system
@@ -0,0 +1,14 @@
+Reduced MochiKit inclusions to one line, because MochiKit.js contains them all
+on Debian
+--- a/openerp/controllers/templates/master.mako
++++ b/openerp/controllers/templates/master.mako
+@@ -9,9 +9,6 @@
+ % endfor
+
+ <script type="text/javascript"
src="/static/javascript/MochiKit/MochiKit.js"></script>
+- <script type="text/javascript"
src="/static/javascript/MochiKit/DragAndDrop.js"></script>
+- <script type="text/javascript"
src="/static/javascript/MochiKit/Resizable.js"></script>
+- <script type="text/javascript"
src="/static/javascript/MochiKit/Sortable.js"></script>
+
+ % for js in widget_javascript.get('head', []):
+ ${js.display()}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9511cc8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+mochikit_system
diff --git a/debian/rules b/debian/rules
index 72e50bb..08a935a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $...@}
+ dh --with quilt $...@}
override_dh_auto_install:
dh_auto_install
@@ -14,6 +14,13 @@ override_dh_auto_install:
rm -rf debian/openerp-web/usr/doc
rm -rf debian/openerp-web/usr/scripts
+
+override_dh_pysupport:
+ dh_pysupport
+
+ # Remove MochiKit, we want to use the system-wide one
+ rm -f
debian/openerp-web/usr/share/pyshared/openerp/static/javascript/MochiKit/*
+
override_dh_installchangelogs:
dh_installchangelogs doc/ChangeLog
--
1.6.5.rc2
_______________________________________________
open-object mailing list
[email protected]
http://lists.debian-maintainers.org/listinfo/open-object
