[Debian-l10n-commits] r2032 - in /pootle/trunk/debian: changelog compat control copyright pootle.dirs pootle.docs pootle.examples pootle.lintian-overrides rules
nekral-guest at users.alioth.debian.org
nekral-guest at users.alioth.debian.org
Sun Dec 13 15:03:59 UTC 2009
Author: nekral-guest
Date: Sun Dec 13 15:03:53 2009
New Revision: 2032
URL: http://svn.debian.org/wsvn/?sc=1&rev=2032
Log:
Removed acknowledgment of NMU. Switching to debhelper 7 voided it.
[ Nicolas François ]
* debian/pootle.example: Removed debian/pootle.conf. The apache
configuration should be updated.
[ Rail Aliev ]
Changes introduced in 1.3.0~beta4-1~ppa1:
* debian/compat: Bumped to 7
* debian/control:
- Drop python-kid dependency.
- Depend on libjs-jquery instead of internal one.
- Updated debhelper build dependency
- Depend on ${misc:Depends}
* debian/rules:
- Use debhelper 7 features to simplify the rules.
- Remove upstream INSTALL file.
- Remove duplicated 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.
* debian/copyright: Do not mention where the license is located in the
source package.
* debian/pootle.dirs: Removed usr/share/lintian/overrides
Removed:
pootle/trunk/debian/pootle.docs
pootle/trunk/debian/pootle.lintian-overrides
Modified:
pootle/trunk/debian/changelog
pootle/trunk/debian/compat
pootle/trunk/debian/control
pootle/trunk/debian/copyright
pootle/trunk/debian/pootle.dirs
pootle/trunk/debian/pootle.examples
pootle/trunk/debian/rules
Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Sun Dec 13 15:03:53 2009
@@ -1,14 +1,31 @@
pootle (2.0.0-1) unstable; urgency=low
- * New upstream release
- * Acknowledge NMU by Sandro Tosi <morph at debian.org>:
- + debian/control: bump versioned dependency on python-all-dev to 2.5.4-1~
- + debian/rules: include python.mk, adapt variables to be compatible with
- the Python 2.5 and 2.6, pass py_setup_install_args to 'setup.py
- install'; thanks to Jakub Wilk for the report; Closes: #557957
+ [ Nicolas François ]
+ * New upstream release
* debian/rules: Cleanup. Removed commented code.
* debian/contrib/cPootle: Removed. It does not apply anymore to the new
version of Pootle.
+ * debian/pootle.example: Removed debian/pootle.conf. The apache
+ configuration should be updated.
+
+ [ Rail Aliev ]
+ Changes introduced in 1.3.0~beta4-1~ppa1:
+ * debian/compat: Bumped to 7
+ * debian/control:
+ - Drop python-kid dependency.
+ - Depend on libjs-jquery instead of internal one.
+ - Updated debhelper build dependency
+ - Depend on ${misc:Depends}
+ * debian/rules:
+ - Use debhelper 7 features to simplify the rules.
+ - Remove upstream INSTALL file.
+ - Remove duplicated 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.
+ * debian/copyright: Do not mention where the license is located in the
+ source package.
+ * debian/pootle.dirs: Removed usr/share/lintian/overrides
-- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net> Sun, 13 Dec 2009 14:12:44 +0100
@@ -63,7 +80,6 @@
* debian/pootle.postinst: Configure the pootle database on installation and
try to import users during updates.
* debian/README.Debian: Update some Debian specific documentation.
- *
-- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net> Sat, 12 Sep 2009 01:12:43 +0200
Modified: pootle/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/compat?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/compat (original)
+++ pootle/trunk/debian/compat Sun Dec 13 15:03:53 2009
@@ -1,1 +1,1 @@
-6
+7
Modified: pootle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/control?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/control (original)
+++ pootle/trunk/debian/control Sun Dec 13 15:03:53 2009
@@ -2,8 +2,8 @@
Section: python
Priority: optional
Maintainer: Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
-Build-Depends-Indep: python-all-dev (>= 2.5.4-1~), python-central (>= 0.5.6)
-Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40)
+Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
+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
@@ -13,7 +13,7 @@
Package: pootle
Architecture: all
Pre-Depends: python-django
-Depends: ${python:Depends}, translate-toolkit (>= 1.5.0), python-kid (>= 0.9.4-1), adduser, python-lxml
+Depends: ${misc:Depends}, ${python:Depends}, translate-toolkit (>= 1.5.0), adduser, python-lxml, libjs-jquery
Recommends: python-xapian, zip, python-levenshtein, iso-codes
XB-Python-Version: ${python:Versions}
Description: Web-based translation and translation management tool
Modified: pootle/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/copyright?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/copyright (original)
+++ pootle/trunk/debian/copyright Sun Dec 13 15:03:53 2009
@@ -20,5 +20,4 @@
General Public License for more details.
On Debian GNU/Linux systems, the complete text of the GNU General Public
-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’.
Modified: pootle/trunk/debian/pootle.dirs
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.dirs?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.dirs (original)
+++ pootle/trunk/debian/pootle.dirs Sun Dec 13 15:03:53 2009
@@ -1,6 +1,5 @@
etc/pootle
usr/sbin
usr/share/doc/pootle
-usr/share/lintian/overrides
usr/share/pootle
var/lib/pootle
Modified: pootle/trunk/debian/pootle.examples
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.examples?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.examples (original)
+++ pootle/trunk/debian/pootle.examples Sun Dec 13 15:03:53 2009
@@ -1,2 +1,1 @@
-debian/pootle.conf
localsettings.py
Modified: pootle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/rules?rev=2032&op=diff
==============================================================================
--- pootle/trunk/debian/rules (original)
+++ pootle/trunk/debian/rules Sun Dec 13 15:03:53 2009
@@ -1,59 +1,19 @@
#!/usr/bin/make -f
-include /usr/share/python/python.mk
+d=$(CURDIR)/debian/pootle
-d=$(CURDIR)/debian/pootle
-pv=$(shell pyversions -vr)
-Pootle=$(d)$(call py_libdir,$(pv))/Pootle
+%:
+ 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) $(py_setup_install_args)
+override_dh_install:
+ dh_install
# Pootle is a WEB server, I prefer to install it in sbin
mv $(d)/usr/bin/PootleServer $(d)/usr/sbin
- dh_lintian
+ # Remove extra files
+ rm $(d)/usr/share/doc/pootle/INSTALL
+ rm $(d)/usr/share/doc/pootle/COPYING
+ # Pootle includes a copy of some javascript libraries
+ 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
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_install
- dh_pycentral --noscripts
- 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
More information about the Debian-l10n-commits
mailing list