[Debian-l10n-commits] r2645 - in /pootle/trunk/debian: changelog control patches/series pootle.install pootle.postinst pootle.prerm

[bubulle at users.alioth.debian.org]

Author: bubulle
Date: Fri May 27 15:50:24 2011
New Revision: 2645

URL: http://svn.debian.org/wsvn/?sc=1&rev=2645
Log:
debian/pootle.config, debian/pootle.postinst, debian/pootle.prerm,
debian.pootle.postrm: Use dbconfig-common to configure database
Closes: #590518

Modified:
    pootle/trunk/debian/changelog
    pootle/trunk/debian/control
    pootle/trunk/debian/patches/series
    pootle/trunk/debian/pootle.install
    pootle/trunk/debian/pootle.postinst
    pootle/trunk/debian/pootle.prerm

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=2645&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Fri May 27 15:50:24 2011
@@ -7,6 +7,9 @@
   * Correct build dependency on quilt
   * Use "3.0 (quilt)" source format
   * Fix typo in README.Debian
+  * debian/pootle.config, debian/pootle.postinst, debian/pootle.prerm,
+    debian.pootle.postrm: Use dbconfig-common to configure database
+    Closes: #590518
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 27 Aug 2010 07:56:07 +0200
 

Modified: pootle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/control?rev=2645&op=diff
==============================================================================
--- pootle/trunk/debian/control (original)
+++ pootle/trunk/debian/control Fri May 27 15:50:24 2011
@@ -13,7 +13,7 @@
 Package: pootle
 Architecture: all
 Pre-Depends: python-django
-Depends: ${misc:Depends}, ${python:Depends}, translate-toolkit (>= 1.5.2), adduser, python-lxml, libjs-jquery, python-django-registration, python-django-djblets
+Depends: ${misc:Depends}, ${python:Depends}, translate-toolkit (>= 1.5.2), adduser, python-lxml, libjs-jquery, python-django-registration, python-django-djblets, dbconfig-common
 Recommends: python-xapian, zip, python-levenshtein, iso-codes, cherrypy
 XB-Python-Version: ${python:Versions}
 Description: Web-based translation and translation management tool

Modified: pootle/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/series?rev=2645&op=diff
==============================================================================
--- pootle/trunk/debian/patches/series (original)
+++ pootle/trunk/debian/patches/series Fri May 27 15:50:24 2011
@@ -3,3 +3,4 @@
 #pootle_continue_after_po_failure.patch
 #import_old_config.patch
 debian_remove_external
+debian_use_dbconfig.patch

Modified: pootle/trunk/debian/pootle.install
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.install?rev=2645&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.install (original)
+++ pootle/trunk/debian/pootle.install Fri May 27 15:50:24 2011
@@ -1,1 +1,3 @@
 debian/pootle.prefs debian/users.prefs /etc/pootle/
+debian/dbconfig.template /usr/share/doc/pootle/
+

Modified: pootle/trunk/debian/pootle.postinst
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.postinst?rev=2645&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.postinst (original)
+++ pootle/trunk/debian/pootle.postinst Fri May 27 15:50:24 2011
@@ -4,6 +4,18 @@
 #
 
 set -e
+
+#dbc_first_version="2.0.5-2"
+dbc_generate_include='template:/etc/pootle/dbconfig.py'
+dbc_generate_include_args=' -o template_infile=/usr/share/doc/pootle/dbconfig.template'
+dbc_generate_include_owner='root:pootle'
+dbc_generate_include_perms='640'
+dbc_pgsql_createdb_encoding='UTF8'
+
+. /usr/share/debconf/confmodule
+# source dbconfig-common stuff');
+. /usr/share/dbconfig-common/dpkg/postinst
+dbc_go pootle $@
 
 POOTLE_USER=pootle
 POOTLE_GROUP=pootle

Modified: pootle/trunk/debian/pootle.prerm
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.prerm?rev=2645&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.prerm (original)
+++ pootle/trunk/debian/pootle.prerm Fri May 27 15:50:24 2011
@@ -1,6 +1,10 @@
 #!/bin/sh
 set -e
-    
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm 
+dbc_go pootle $@
+   
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.