>>>>> On Fri, 11 Sep 2009 12:55:23 +0200, Nicolas François
>>>>> <nekral.li...@gmail.com> said:
NF> On Fri, Sep 11, 2009 at 12:30:56PM +0200, Nicolas François wrote:
>>
>> So you are warned, I do not consider the packaging as finished, but you
>> might want to try it. I did not upload it to the translate repository
>> because of the above issues and the possible unavailability to fix them,
>> but you can download the package from:
NF> Here is the missing link:
NF> http://alioth.debian.org/~nekral-guest/packages/translate/pootle/
Nicolas,
First of all, thanks for you packaging effort.
I haven't switched to 1.3 yet, so migration is not tested.
Please review the attached debdiff which simplifies debian/rules using
debhelper 7 features. See my comments in debian/changelog.
--
Best regards,
Rail Aliev
reverted:
--- pootle-1.3.0~beta3/manage.py
+++ pootle-1.3.0~beta3.orig/manage.py
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
+import syspath_override
-# import syspath_override
from django.core.management import execute_manager
try:
reverted:
--- pootle-1.3.0~beta3/setup.py
+++ pootle-1.3.0~beta3.orig/setup.py
@@ -184,9 +184,8 @@
# used with os.path.join() as above. This also means that data_dir
# should be changed here if the value # of INSTALL_DATA_DIR becomes
# an absolute path.
+ conf_dir = util.change_root(self.root, INSTALL_CONFIG_DIR)
+ work_dir = util.change_root(self.root, INSTALL_WORKING_DIR)
- conf_dir = util.change_root("/", INSTALL_CONFIG_DIR)
- data_dir = util.change_root("/usr", INSTALL_DATA_DIR)
- work_dir = util.change_root("/", INSTALL_WORKING_DIR)
# Replace directory variables in settings.py to reflect the current installation
lines = open(install_dirs_py_path).readlines()
diff -u pootle-1.3.0~beta3/debian/changelog pootle-1.3.0~beta3/debian/changelog
--- pootle-1.3.0~beta3/debian/changelog
+++ pootle-1.3.0~beta3/debian/changelog
@@ -1,8 +1,21 @@
pootle (1.3.0~beta3-1) UNRELEASED; urgency=low
+ [ Nicolas FRANCOIS ]
* New beta upstream release
* debian/control: Depend on python-django instead of python-jtoolkit
+ [ Rail Aliev ]
+ * debian/control:
+ - Drop python-kid dependency.
+ - Depend on libjs-jquery instead of internal one.
+ * debian/rules:
+ - Use debhelper 7 features to simplify the rules.
+ - Remove upstream INSTALL file.
+ - Remove deplicated COPYING file.
+ - Use symlinked jquery.min.js from libjs-jquery instead of internal.
+ - Remove unused debian/pootle.lintian-overrides and not needed
+ debian/pootle.docs files.
+
-- Nicolas FRANCOIS (Nekral) <nicolas.franc...@centraliens.net> Tue, 08 Sep 2009 23:48:51 +0200
pootle (1.2.1-4) unstable; urgency=low
diff -u pootle-1.3.0~beta3/debian/pootle.dirs pootle-1.3.0~beta3/debian/pootle.dirs
--- pootle-1.3.0~beta3/debian/pootle.dirs
+++ pootle-1.3.0~beta3/debian/pootle.dirs
@@ -2,5 +2,4 @@
usr/sbin
usr/share/doc/pootle
-usr/share/lintian/overrides
usr/share/pootle
var/lib/pootle
reverted:
--- pootle-1.3.0~beta3/debian/pootle.lintian-overrides
+++ pootle-1.3.0~beta3.orig/debian/pootle.lintian-overrides
@@ -1 +0,0 @@
-pootle: script-not-executable
reverted:
--- pootle-1.3.0~beta3/debian/pootle.docs
+++ pootle-1.3.0~beta3.orig/debian/pootle.docs
@@ -1 +0,0 @@
-README
diff -u pootle-1.3.0~beta3/debian/compat pootle-1.3.0~beta3/debian/compat
--- pootle-1.3.0~beta3/debian/compat
+++ pootle-1.3.0~beta3/debian/compat
@@ -1 +1 @@
-6
+7
diff -u pootle-1.3.0~beta3/debian/control pootle-1.3.0~beta3/debian/control
--- pootle-1.3.0~beta3/debian/control
+++ pootle-1.3.0~beta3/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Nicolas FRANCOIS (Nekral) <nicolas.franc...@centraliens.net>
Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
-Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40)
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40)
XS-Python-Version: current, >= 2.3
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/debian-l10n/pootle/trunk
@@ -12,7 +12,8 @@
Package: pootle
Architecture: all
-Depends: ${python:Depends}, translate-toolkit (>= 1.2.1-1), python-kid (>= 0.9.4-1), adduser, python-lxml, python-django
+Depends: ${misc:Depends}, ${python:Depends}, translate-toolkit (>= 1.2.1-1),
+ adduser, python-lxml, python-django, libjs-jquery
Recommends: python-xapian, zip, python-levenshtein
XB-Python-Version: ${python:Versions}
Description: Web-based translation and translation management tool
diff -u pootle-1.3.0~beta3/debian/rules pootle-1.3.0~beta3/debian/rules
--- pootle-1.3.0~beta3/debian/rules
+++ pootle-1.3.0~beta3/debian/rules
@@ -4,84 +4,12 @@
-pv=$(shell pyversions -vr)
-Pootle=$(d)/usr/lib/python$(pv)/site-packages/Pootle
-DH_PYCENTRAL=nomove
+%:
+ dh --with quilt --with python-central $@
-include /usr/share/quilt/quilt.make
-
-build: build-stamp
-build-stamp: patch
- dh_testdir
- python setup.py build
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -rf build
- find -name '*.py[co]' | xargs rm -f
- rm -f MANIFEST.in
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- python setup.py install --root=$(d)
- # Pootle is a WEB server, I prefer to install it in sbin
- mv $(d)/usr/bin/PootleServer $(d)/usr/sbin
- # Remove the tests and unused files
-# rm -f $(Pootle)/test_client.py \
- $(Pootle)/test_create.py \
- $(Pootle)/test_indexing.py \
- $(Pootle)/test_init.py \
- $(Pootle)/test_pootlefile.py \
- $(Pootle)/test_statistics.py \
- $(Pootle)/pootle.prefs \
- $(Pootle)/users.prefs \
- $(Pootle)/conftest.py \
- $(Pootle)/benchmark.py \
- $(Pootle)/conflict2suggest.py \
- $(Pootle)/test_cmdlineserver.py
- # These files will be installed by dh_installdocs or
- # dh_installchangelogs
-# rm -f $(Pootle)/ChangeLog \
- $(Pootle)/COPYING \
- $(Pootle)/CREDITS \
- $(Pootle)/README
- # Move the non-python parts to /usr/share/pootle/
-# mv $(Pootle)/html \
- $(d)/usr/share/pootle/html
- # remove the exec mode on these files
-# find $(d)/usr/share/pootle -type f -exec chmod a-x {} \;
- # Move the po directory to /var/lib/pootle
-# mv $(Pootle)/po/pootle \
- $(d)/var/lib/pootle/pootle
-# rmdir $(Pootle)/po
- dh_lintian
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
+override_dh_install:
dh_install
- dh_pycentral
- dh_installinit
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+ mv $(d)/usr/bin/PootleServer $(d)/usr/sbin
+ rm $(d)/usr/share/doc/pootle/INSTALL
+ rm $(d)/usr/share/doc/pootle/COPYING
+ rm $(d)/usr/share/pootle/html/js/jquery/jquery.min.js
+ dh_link /usr/share/javascript/jquery/jquery.min.js \
+ /usr/share/pootle/html/js/jquery/jquery.min.js
diff -u pootle-1.3.0~beta3/debian/copyright pootle-1.3.0~beta3/debian/copyright
--- pootle-1.3.0~beta3/debian/copyright
+++ pootle-1.3.0~beta3/debian/copyright
@@ -23,2 +23 @@
-License can be found in ‘/usr/share/common-licenses/GPL-2’ or in the pootle
-source as the file ‘COPYING’
+License can be found in ‘/usr/share/common-licenses/GPL-2’.
diff -u pootle-1.3.0~beta3/debian/patches/series pootle-1.3.0~beta3/debian/patches/series
--- pootle-1.3.0~beta3/debian/patches/series
+++ pootle-1.3.0~beta3/debian/patches/series
@@ -6,0 +7,2 @@
+manage.py.diff
+setup.py.diff
only in patch2:
unchanged:
--- pootle-1.3.0~beta3.orig/debian/patches/manage.py.diff
+++ pootle-1.3.0~beta3/debian/patches/manage.py.diff
@@ -0,0 +1,11 @@
+--- pootle-1.3.0~beta3.orig/manage.py
++++ pootle-1.3.0~beta3/manage.py
+@@ -18,7 +18,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+-import syspath_override
++# import syspath_override
+
+ from django.core.management import execute_manager
+ try:
only in patch2:
unchanged:
--- pootle-1.3.0~beta3.orig/debian/patches/setup.py.diff
+++ pootle-1.3.0~beta3/debian/patches/setup.py.diff
@@ -0,0 +1,14 @@
+--- pootle-1.3.0~beta3.orig/setup.py
++++ pootle-1.3.0~beta3/setup.py
+@@ -184,8 +184,9 @@
+ # used with os.path.join() as above. This also means that data_dir
+ # should be changed here if the value # of INSTALL_DATA_DIR becomes
+ # an absolute path.
+- conf_dir = util.change_root(self.root, INSTALL_CONFIG_DIR)
+- work_dir = util.change_root(self.root, INSTALL_WORKING_DIR)
++ conf_dir = util.change_root("/", INSTALL_CONFIG_DIR)
++ data_dir = util.change_root("/usr", INSTALL_DATA_DIR)
++ work_dir = util.change_root("/", INSTALL_WORKING_DIR)
+
+ # Replace directory variables in settings.py to reflect the current installation
+ lines = open(install_dirs_py_path).readlines()
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Translate-pootle mailing list
Translate-pootle@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/translate-pootle
