[Python-apps-commits] r86 - in /packages/planet/trunk/debian: changelog control control.in postinst postrm rules
arnau-guest at users.alioth.debian.org
arnau-guest at users.alioth.debian.org
Mon Sep 24 23:48:04 UTC 2007
Author: arnau-guest
Date: Mon Sep 24 23:48:04 2007
New Revision: 86
URL: http://svn.debian.org/wsvn/python-apps/?sc=1&rev=86
Log:
* debian/control*:
+ Add debconf-2.0 to Depends in addition of debconf.
* debian/postinst debian/postrm:
+ Avoid exiting maintainer script before #DEBHELPER# in case of
debhelper inserts other actions. Thanks to Christoph Berg.
Modified:
packages/planet/trunk/debian/changelog
packages/planet/trunk/debian/control
packages/planet/trunk/debian/control.in
packages/planet/trunk/debian/postinst
packages/planet/trunk/debian/postrm
packages/planet/trunk/debian/rules
Modified: packages/planet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-apps/packages/planet/trunk/debian/changelog?rev=86&op=diff
==============================================================================
--- packages/planet/trunk/debian/changelog (original)
+++ packages/planet/trunk/debian/changelog Mon Sep 24 23:48:04 2007
@@ -1,8 +1,16 @@
planet (2.0-12) UNRELEASED; urgency=low
- * XS-Vcs-Svn, XS-Vcs-Browser and Homepage fields added
+ [ Arnaud Fontaine ]
+ * debian/control*:
+ + Add debconf-2.0 to Depends in addition of debconf.
+ * debian/postinst debian/postrm:
+ + Avoid exiting maintainer script before #DEBHELPER# in case of
+ debhelper inserts other actions. Thanks to Christoph Berg.
- -- Piotr Ożarowski <piotr at debian.org> Sat, 22 Sep 2007 17:16:41 +0200
+ [ Piotr Ożarowski ]
+ * XS-Vcs-Svn, XS-Vcs-Browser and Homepage fields added.
+
+ -- Arnaud Fontaine <arnaud at andesi.org> Mon, 24 Sep 2007 23:49:04 +0100
planet (2.0-11) unstable; urgency=low
Modified: packages/planet/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-apps/packages/planet/trunk/debian/control?rev=86&op=diff
==============================================================================
--- packages/planet/trunk/debian/control (original)
+++ packages/planet/trunk/debian/control Mon Sep 24 23:48:04 2007
@@ -12,7 +12,7 @@
Package: planet
Architecture: all
-Depends: ${python:Depends}, debconf, apache2 | httpd
+Depends: ${python:Depends}, debconf | debconf-2.0, apache2 | httpd
Recommends: python-chardet, python-utidylib
Description: Flexible feed aggregator
Downloads news feeds published by web sites and aggregates their
Modified: packages/planet/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/python-apps/packages/planet/trunk/debian/control.in?rev=86&op=diff
==============================================================================
--- packages/planet/trunk/debian/control.in (original)
+++ packages/planet/trunk/debian/control.in Mon Sep 24 23:48:04 2007
@@ -12,7 +12,7 @@
Package: planet
Architecture: all
-Depends: ${python:Depends}, debconf, apache2 | httpd
+Depends: ${python:Depends}, debconf | debconf-2.0, apache2 | httpd
Recommends: python-chardet, python-utidylib
Description: Flexible feed aggregator
Downloads news feeds published by web sites and aggregates their
@@ -21,5 +21,3 @@
It uses Mark Pilgrim's Universal Feed Parser to read from RDF, RSS
and Atom feeds; and Tomas Styblo's templating engine to output static
files in any format you can dream up.
- .
- Homepage: http://www.planetplanet.org/
Modified: packages/planet/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/python-apps/packages/planet/trunk/debian/postinst?rev=86&op=diff
==============================================================================
--- packages/planet/trunk/debian/postinst (original)
+++ packages/planet/trunk/debian/postinst Mon Sep 24 23:48:04 2007
@@ -1,58 +1,57 @@
#!/bin/sh -e
-[ "$1" = "configure" ] || exit 0
+if [ "$1" = "configure" ]; then
+ . /usr/share/debconf/confmodule
-. /usr/share/debconf/confmodule
+ db_get planet/template
+ ln -sf /usr/share/planet/templates/"$RET".html.tmpl /var/lib/planet/templates/index.html.tmpl
-TPML_PATH=/var/lib/planet/templates
-db_get planet/template
-ln -sf /usr/share/planet/templates/"$RET".html.tmpl /var/lib/planet/templates/index.html.tmpl
+ db_get planet/configure
+ if [ "$RET" = true ]; then
+ db_get planet/planet_name
+ name="$RET"
+ if [ -z "$name" ]; then
+ name="default"
+ fi
-db_get planet/configure
-if [ "$RET" = true ]; then
- db_get planet/planet_name
- name="$RET"
- if [ -z "$name" ]; then
- name="default"
+ db_get planet/planet_link
+ link="$RET"
+ if [ -z "$link" ]; then
+ link="default"
+ fi
+
+ db_get planet/planet_owner_name
+ owner_name="$RET"
+ if [ -z "$owner_name" ]; then
+ owner_name="default"
+ fi
+
+ db_get planet/planet_owner_email
+ owner_email="$RET"
+ if [ -z owner_email ]; then
+ owner_email="default"
+ fi
+
+ section="# Your planet's name\nname=$name\n# Link to the main page\nlink=$link\n"
+ section="$section# Your name\nowner_name=$owner_name\n# Your e-mail address\nowner_email=$owner_email"
+
+ if [ ! -f "/etc/planet.conf" ]; then
+ cp /usr/share/doc/planet/examples/planet.conf.debconf /etc/planet.conf
+ else
+ if [ ! `grep -q '### DEBCONF ###' /etc/planet.conf` ] ||
+ [ ! `grep -q '### END DEBCONF ###' /etc/planet.conf` ]; then
+ mv /etc/planet.conf /etc/planet.conf.dpkg-old
+ cp /usr/share/doc/planet/examples/planet.conf.debconf /etc/planet.conf
+ fi
+ fi
+
+ # Replace the section between "### DEBCONF ###" and "### END
+ # DEBCONF ###" with the contents of $section
+ sed -i -e "/^### DEBCONF ###/ {p; i\\$section" -e 'h;d;n}; x; /^### DEBCONF ###/ { x; /^### END DEBCONF ###$/!{d;n}; h}; x' /etc/planet.conf
fi
- db_get planet/planet_link
- link="$RET"
- if [ -z "$link" ]; then
- link="default"
- fi
-
- db_get planet/planet_owner_name
- owner_name="$RET"
- if [ -z "$owner_name" ]; then
- owner_name="default"
- fi
-
- db_get planet/planet_owner_email
- owner_email="$RET"
- if [ -z owner_email ]; then
- owner_email="default"
- fi
-
- section="# Your planet's name\nname=$name\n# Link to the main page\nlink=$link\n"
- section="$section# Your name\nowner_name=$owner_name\n# Your e-mail address\nowner_email=$owner_email"
-
- if [ ! -f "/etc/planet.conf" ]; then
- cp /usr/share/doc/planet/examples/planet.conf.debconf /etc/planet.conf
- else
- if [ -z "`grep '### DEBCONF ###' /etc/planet.conf`" ] ||
- [ -z "`grep '### END DEBCONF ###' /etc/planet.conf`" ]; then
- mv /etc/planet.conf /etc/planet.conf.dpkg-old
- cp /usr/share/doc/planet/examples/planet.conf.debconf /etc/planet.conf
- fi
- fi
-
- # Replace the section between "### DEBCONF ###" and "### END DEBCONF ###"
- # with the contents of $section
- sed -i -e "/^### DEBCONF ###/ {p; i\\$section" -e 'h;d;n}; x; /^### DEBCONF ###/ { x; /^### END DEBCONF ###$/!{d;n}; h}; x' /etc/planet.conf
+ db_stop
fi
-
-db_stop
#DEBHELPER#
Modified: packages/planet/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/python-apps/packages/planet/trunk/debian/postrm?rev=86&op=diff
==============================================================================
--- packages/planet/trunk/debian/postrm (original)
+++ packages/planet/trunk/debian/postrm Mon Sep 24 23:48:04 2007
@@ -1,8 +1,8 @@
#!/bin/sh -e
+#DEBHELPER#
+
[ "$1" = "purge" ] || exit 0
-
-#DEBHELPER#
if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
Modified: packages/planet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-apps/packages/planet/trunk/debian/rules?rev=86&op=diff
==============================================================================
--- packages/planet/trunk/debian/rules (original)
+++ packages/planet/trunk/debian/rules Mon Sep 24 23:48:04 2007
@@ -7,7 +7,6 @@
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Don't compress .py files
DEB_COMPRESS_EXCLUDE := .png .tmpl
# Install .py files in the proper directory for
More information about the Python-apps-commits
mailing list