[Pkg-zenoss-commits] r201 - in /packages/zenoss/trunk/debian: changelog patches/00list patches/bypass_eula.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jul  3 21:29:44 2007
New Revision: 201

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=201
Log:
* debian/patches
  - added bypass_eula which inhibit the "EULA" splash screen to be shown by
    the user. Patch added in agreement with Zenoss.com upstream author, see
    patch description for more details.

Added:
    packages/zenoss/trunk/debian/patches/bypass_eula.dpatch   (with props)
Modified:
    packages/zenoss/trunk/debian/changelog
    packages/zenoss/trunk/debian/patches/00list

Modified: packages/zenoss/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/changelog?rev=201&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/changelog (original)
+++ packages/zenoss/trunk/debian/changelog Tue Jul  3 21:29:44 2007
@@ -8,6 +8,10 @@
   * debian/control
     - bumped dependency on dbconfig-common to match the first version which
       includes the patches we need
+  * debian/patches
+    - added bypass_eula which inhibit the "EULA" splash screen to be shown by
+      the user. Patch added in agreement with Zenoss.com upstream author, see
+      patch description for more details.
 
   [ Bernd Zeimetz ]
   * updating to latest svn revision
@@ -15,7 +19,7 @@
     - run dh_installdebconf before dh_installdeb
     - add missing perf directory to our Zope skeleton
 
- -- Bernd Zeimetz <bernd at bzed.de>  Sat, 30 Jun 2007 22:05:26 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 03 Jul 2007 23:27:28 +0200
 
 zenoss (2.0+r5780-1) experimental; urgency=low
 

Modified: packages/zenoss/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/00list?rev=201&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/00list (original)
+++ packages/zenoss/trunk/debian/patches/00list Tue Jul  3 21:29:44 2007
@@ -7,3 +7,4 @@
 zenfunctions-pythonpath
 zensocket-location
 drop_triggers_before_db_creation
+bypass_eula

Added: packages/zenoss/trunk/debian/patches/bypass_eula.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/bypass_eula.dpatch?rev=201&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/bypass_eula.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/bypass_eula.dpatch Tue Jul  3 21:29:44 2007
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bypass_eula.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid showing the "EULA" for Zenoss to the user. Patch added with the
+## DP: consent of Zenoss.com that feel Zenoss-core to be bound only by the
+## DP: terms of the GPL. The "EULA" will be removed/reworded in future versions
+## DP: anyhow.
+
+ at DPATCH@
+diff -urNad trunk~/Products/ZenModel/DataRoot.py trunk/Products/ZenModel/DataRoot.py
+--- trunk~/Products/ZenModel/DataRoot.py	2007-05-30 20:26:43.000000000 +0100
++++ trunk/Products/ZenModel/DataRoot.py	2007-06-20 14:44:34.000000000 +0100
+@@ -69,7 +69,7 @@
+     lastVersionCheckAttempt = 0
+     versionCheckOptIn = True
+     reportMetricsOptIn = True
+-    acceptedTerms = False
++    acceptedTerms = True
+     smtpHost = 'localhost'
+     snppHost = 'localhost'
+     smtpPort = 25

Propchange: packages/zenoss/trunk/debian/patches/bypass_eula.dpatch
------------------------------------------------------------------------------
    svn:executable = *