[Debian-l10n-commits] r1730 - in /pootle/trunk/debian: changelog compat control pootle.lintian pootle.lintian-overrides pootle.postinst pootle.prerm rules

[nekral-guest at users.alioth.debian.org]

Author: nekral-guest
Date: Fri May 22 19:36:24 2009
New Revision: 1730

URL: http://svn.debian.org/wsvn/?sc=1&rev=1730
Log:
  * debian/rules, debian/pootle.lintian-overrides: Use dh_lintian to install
    the lintian overrides.
  * debian/control, debian/compat: Build depend on debhelper >= 6.0.7 for
    dh_lintian.
  * debian/pootle.postinst, debian/pootle.prerm, debian/rules: dh_installinit
    --no-start and the manually added code in postinst and prerm are no more
    needed.

Added:
    pootle/trunk/debian/pootle.lintian-overrides
      - copied unchanged from r1541, pootle/trunk/debian/pootle.lintian
Removed:
    pootle/trunk/debian/pootle.lintian
Modified:
    pootle/trunk/debian/changelog
    pootle/trunk/debian/compat
    pootle/trunk/debian/control
    pootle/trunk/debian/pootle.postinst
    pootle/trunk/debian/pootle.prerm
    pootle/trunk/debian/rules

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=1730&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Fri May 22 19:36:24 2009
@@ -3,8 +3,15 @@
   * debian/control: Recommend python-levenshtein.
   * debian/pootle.init: Display a message when pootle is started, but disabled
     in /etc/default/pootle. Closes: #525130
-
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 22 May 2009 21:16:39 +0200
+  * debian/rules, debian/pootle.lintian-overrides: Use dh_lintian to install
+    the lintian overrides.
+  * debian/control, debian/compat: Build depend on debhelper >= 6.0.7 for
+    dh_lintian.
+  * debian/pootle.postinst, debian/pootle.prerm, debian/rules: dh_installinit
+    --no-start and the manually added code in postinst and prerm are no more
+    needed.
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 22 May 2009 21:32:24 +0200
 
 pootle (1.2.1-1) experimental; urgency=low
 

Modified: pootle/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/compat?rev=1730&op=diff
==============================================================================
--- pootle/trunk/debian/compat (original)
+++ pootle/trunk/debian/compat Fri May 22 19:36:24 2009
@@ -1,1 +1,1 @@
-5
+6

Modified: pootle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/control?rev=1730&op=diff
==============================================================================
--- pootle/trunk/debian/control (original)
+++ pootle/trunk/debian/control Fri May 22 19:36:24 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
 Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
-Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40)
+Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40)
 XS-Python-Version: current, >= 2.3
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/debian-l10n/pootle/trunk

Modified: pootle/trunk/debian/pootle.postinst
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.postinst?rev=1730&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.postinst (original)
+++ pootle/trunk/debian/pootle.postinst Fri May 22 19:36:24 2009
@@ -56,21 +56,4 @@
 
 #DEBHELPER#
 
-############################################
-# This section is copied from dh_installinit
-# It has to be done manually because
-# * on install, the python module have to be installed, and then the init
-#   script can be started.
-# * on removal, the server must be stopped before removing the modules
-#   (otherwise some .pyc may be left)
-# So we cannot use dh_installinit to start the server
-if [ -x "/etc/init.d/pootle" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d pootle start || exit $?
-	else
-		/etc/init.d/pootle start || exit $?
-	fi
-fi
-############################################
-
 exit 0

Modified: pootle/trunk/debian/pootle.prerm
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.prerm?rev=1730&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.prerm (original)
+++ pootle/trunk/debian/pootle.prerm Fri May 22 19:36:24 2009
@@ -1,19 +1,6 @@
 #!/bin/sh
 set -e
     
-############################################
-# Stop the server before removing the python modules.
-# See pootle.postinst
-# This section is copied from dh_installinit
-if [ -x "/etc/init.d/pootle" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d pootle stop || exit $?
-	else
-		/etc/init.d/pootle stop || exit $?
-	fi
-fi
-############################################
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

Modified: pootle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/rules?rev=1730&op=diff
==============================================================================
--- pootle/trunk/debian/rules (original)
+++ pootle/trunk/debian/rules Fri May 22 19:36:24 2009
@@ -57,10 +57,7 @@
 	mv $(Pootle)/po/pootle \
 	   $(d)/var/lib/pootle/pootle
 	rmdir $(Pootle)/po
-	# Install an overrides for the script-not-executable warnings
-	# (python modules with a shebang).
-	install -p -D -m644 debian/pootle.lintian \
-	                    $(d)/usr/share/lintian/overrides/pootle
+	dh_lintian
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -72,10 +69,7 @@
 	dh_installman
 	dh_install
 	dh_pycentral
-	# The server is started/stopped manually (see pootle.postinst).
-	# TODO: check whether the postinst, prerm and postrm have to be
-	#       updated according to the dh_installinit standard.
-	dh_installinit --no-start
+	dh_installinit
 	dh_compress
 	dh_fixperms
 	dh_installdeb