Do not change base_dir, do symlinks instead.

This commit is contained in:
Thomas Goirand 2014-10-06 16:19:40 +08:00
parent 29fcc8d4d1
commit 6a4e3b7a50
4 changed files with 24 additions and 17 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
python-xstatic-jquery-ui (1.10.1.1+debian+dfsg1-3) unstable; urgency=medium
* Manages symlinks to libjs-jquery-ui correctly.
-- Thomas Goirand <zigo@debian.org> Mon, 06 Oct 2014 16:18:28 +0800
python-xstatic-jquery-ui (1.10.1.1+debian+dfsg1-2) unstable; urgency=medium
* Fixed licensing information as per FTP master suggestion.

10
debian/control vendored
View File

@ -17,7 +17,10 @@ Homepage: http://jqueryui.com/
Package: python-xstatic-jquery-ui
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: libjs-jquery-ui, python-xstatic, ${misc:Depends}, ${python:Depends}
Depends: libjs-jquery-ui (>= 1.10.1),
python-xstatic,
${misc:Depends},
${python:Depends}
Description: JQuery UI XStatic support - Python 2.x
XStatic is a packaging standard to package external (often 3rd party) static
files as a Python package, so they are easily usable on all operating systems,
@ -45,7 +48,10 @@ Description: JQuery UI XStatic support - Python 2.x
Package: python3-xstatic-jquery-ui
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: libjs-jquery-ui, python3-xstatic, ${misc:Depends}, ${python3:Depends}
Depends: libjs-jquery-ui (>= 1.10.1),
python3-xstatic,
${misc:Depends},
${python3:Depends}
Description: JQuery UI XStatic support - Python 3.x
XStatic is a packaging standard to package external (often 3rd party) static
files as a Python package, so they are easily usable on all operating systems,

View File

@ -2,7 +2,7 @@ Description: Debianize
Using files from libjs-jquery-ui instead of the embedded version.
Author: Thomas Goirand <zigo@debian.org>
Forwarded: not-needed
Last-Update: 2014-08-18
Last-Update: 2014-10-06
--- python-xstatic-jquery-ui-1.10.1.1+debian+dfsg1.orig/xstatic/pkg/jquery_ui/__init__.py
+++ python-xstatic-jquery-ui-1.10.1.1+debian+dfsg1/xstatic/pkg/jquery_ui/__init__.py
@ -15,15 +15,3 @@ Last-Update: 2014-08-18
# version number
BUILD = '1' # our package build number, so we can release new builds
# with fixes for xstatic stuff.
@@ -34,9 +34,9 @@ HOMEPAGE = 'http://jqueryui.com/'
LICENSE = '(same as %s)' % DISPLAY_NAME
from os.path import join, dirname
-BASE_DIR = join(dirname(__file__), 'data')
+#BASE_DIR = join(dirname(__file__), 'data')
# linux package maintainers just can point to their file locations like this:
-#BASE_DIR = '/usr/share/javascript/jquery_ui'
+BASE_DIR = '/usr/share/javascript/jquery-ui'
LOCATIONS = {}

11
debian/rules vendored
View File

@ -10,13 +10,20 @@ UPSTREAM_GIT = hg::https://bitbucket.org/thomaswaldmann/xstatic-jquery_ui
dh $@ --buildsystem=python_distutils --with python2,python3
override_dh_install:
set -e && for pyvers in $(PYTHONS); do \
set -e ; for pyvers in $(PYTHONS); do \
python$$pyvers setup.py install --install-layout=deb \
--root $(CURDIR)/debian/python-xstatic-jquery-ui; \
mkdir -p $(CURDIR)/debian/python-xstatic-jquery-ui/usr/lib/python$$pyvers/dist-packages/xstatic/pkg/jquery_ui/data ; \
done
set -e && for pyvers in $(PYTHON3S); do \
set -e ; for pyvers in $(PYTHON3S); do \
python$$pyvers setup.py install --install-layout=deb \
--root $(CURDIR)/debian/python3-xstatic-jquery-ui; \
mkdir -p $(CURDIR)/debian/python3-xstatic-jquery-ui/usr/lib/python3/dist-packages/xstatic/pkg/jquery_ui/data ; \
done
set -ex ; for i in $(CURDIR)/debian/python*-xstatic-jquery-ui/usr/lib/python*/dist-packages/xstatic/pkg/jquery_ui/data ; do \
ln -s /usr/share/javascript/jquery-ui/jquery-ui.js $$i/jquery-ui.js ; \
ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js $$i/jquery-ui.min.js ; \
ln -s /usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css $$i/jquery-ui.css ; \
done
rm -rf $(CURDIR)/debian/python*-xstatic-jquery-ui/usr/lib/python*/dist-packages/*.pth