[Python-modules-commits] r25196 - in packages/celery/trunk/debian (5 files)

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

    Date: Monday, July 15, 2013 @ 12:17:31
  Author: fladi-guest
Revision: 25196

Merge changes from wheezy branch.

Added:
  packages/celery/trunk/debian/python-celery.postinst
    (from rev 25195, packages/celery/branches/wheezy/debian/python-celery.postinst)
  packages/celery/trunk/debian/python-celery.postrm
    (from rev 25195, packages/celery/branches/wheezy/debian/python-celery.postrm)
Modified:
  packages/celery/trunk/debian/changelog
  packages/celery/trunk/debian/control
  packages/celery/trunk/debian/copyright

Modified: packages/celery/trunk/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog	2013-07-15 12:05:56 UTC (rev 25195)
+++ packages/celery/trunk/debian/changelog	2013-07-15 12:17:31 UTC (rev 25196)
@@ -1,15 +1,23 @@
-celery (2.5.5-2) UNRELEASED; urgency=low
+celery (2.5.3-4) unstable; urgency=low
 
-  * Use canonical URIs for Vcs-* fields.
+  * Unconditionally remove /var/log/celery on purge.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:00:34 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 01 Mar 2013 12:17:32 +0100
 
-celery (2.5.5-1) unstable; urgency=low
+celery (2.5.3-3) unstable; urgency=low
 
-  * New upstream release.
+  * Remove logfiles during purge if user and group are removed.
+  * Use /nonexistant as $HOME for user celery.
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 18 Jun 2012 15:41:19 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 12 Feb 2013 08:57:59 +0100
 
+celery (2.5.3-2) unstable; urgency=low
+
+  * Create user celery in maintainer scripts (Closes: #697195).
+  * Update year in d/copyright.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Sun, 13 Jan 2013 19:10:12 +0100
+
 celery (2.5.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/celery/trunk/debian/control
===================================================================
--- packages/celery/trunk/debian/control	2013-07-15 12:05:56 UTC (rev 25195)
+++ packages/celery/trunk/debian/control	2013-07-15 12:17:31 UTC (rev 25196)
@@ -31,12 +31,13 @@
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
 Homepage: http://github.com/ask/celery/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/celery/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/celery/trunk/
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/celery/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/celery/trunk/
 
 Package: python-celery
 Architecture: all
-Depends: python-amqplib,
+Depends: adduser,
+         python-amqplib,
          python-anyjson (>= 0.3.1),
          python-cl,
          python-dateutil (>= 1.5),

Modified: packages/celery/trunk/debian/copyright
===================================================================
--- packages/celery/trunk/debian/copyright	2013-07-15 12:05:56 UTC (rev 25195)
+++ packages/celery/trunk/debian/copyright	2013-07-15 12:17:31 UTC (rev 25196)
@@ -16,7 +16,7 @@
 License: BSD
 
 Files: debian/*
-Copyright: 2012, Michael Fladischer
+Copyright: 2012-2013, Michael Fladischer
            2010, Elliot Murphy
 License: BSD-solem
 

Copied: packages/celery/trunk/debian/python-celery.postinst (from rev 25195, packages/celery/branches/wheezy/debian/python-celery.postinst)
===================================================================
--- packages/celery/trunk/debian/python-celery.postinst	                        (rev 0)
+++ packages/celery/trunk/debian/python-celery.postinst	2013-07-15 12:17:31 UTC (rev 25196)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure|reconfigure)
+        adduser \
+            --system \
+            --quiet \
+            --home /nonexistant \
+            --no-create-home \
+            --group \
+            celery
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        exit 0
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+

Copied: packages/celery/trunk/debian/python-celery.postrm (from rev 25195, packages/celery/branches/wheezy/debian/python-celery.postrm)
===================================================================
--- packages/celery/trunk/debian/python-celery.postrm	                        (rev 0)
+++ packages/celery/trunk/debian/python-celery.postrm	2013-07-15 12:17:31 UTC (rev 25196)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    purge)
+        rm -rf /var/log/celery
+        if [ -x "$(command -v deluser)" ]; then
+            deluser --quiet --system celery > /dev/null || true
+            deluser --group --system --quiet --only-if-empty celery || true
+        else
+            echo >&2 "not removing celery system account, group and logfiles because deluser command was not found"
+        fi
+	;;
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+    *)
+	echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+esac
+
+#DEBHELPER#
+
+exit 0