[Python-apps-commits] r7711 - in packages/trac-bitten/trunk/debian (control copyright rules)

[debacle at users.alioth.debian.org]

    Date: Monday, October 24, 2011 @ 23:23:10
  Author: debacle
Revision: 7711

Lintians.

Modified:
  packages/trac-bitten/trunk/debian/control
  packages/trac-bitten/trunk/debian/copyright
  packages/trac-bitten/trunk/debian/rules

Modified: packages/trac-bitten/trunk/debian/control
===================================================================
--- packages/trac-bitten/trunk/debian/control	2011-10-24 23:22:04 UTC (rev 7710)
+++ packages/trac-bitten/trunk/debian/control	2011-10-24 23:23:10 UTC (rev 7711)
@@ -26,7 +26,7 @@
 
 Package: trac-bitten-slave
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
+Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources, adduser
 Description: continuous integration plugin for Trac
  Bitten is a Trac extension for continuous integration. It uses
  a distributed build model, where one or more "slaves" run the

Modified: packages/trac-bitten/trunk/debian/copyright
===================================================================
--- packages/trac-bitten/trunk/debian/copyright	2011-10-24 23:22:04 UTC (rev 7710)
+++ packages/trac-bitten/trunk/debian/copyright	2011-10-24 23:23:10 UTC (rev 7711)
@@ -20,23 +20,34 @@
     © 2007 Ole Trenner <ole at jayotee.de>
     © 2007 Wei Zhuo <weizhuo at gmail.com>
     © 2009 Grzegorz Sobanski <silk at boktor.net>
+    © 2007-2010 Edgewall Software
 
 License:
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
+All rights reserved.
 
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-On Debian systems, the complete text of the BSD License can be found
-in `/usr/share/common-licenses/BSD'.
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ 3. The name of the author may not be used to endorse or promote
+    products derived from this software without specific prior
+    written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: packages/trac-bitten/trunk/debian/rules
===================================================================
--- packages/trac-bitten/trunk/debian/rules	2011-10-24 23:22:04 UTC (rev 7710)
+++ packages/trac-bitten/trunk/debian/rules	2011-10-24 23:23:10 UTC (rev 7711)
@@ -17,9 +17,10 @@
 	rm $(CURDIR)/debian/trac-bitten/usr/share/pyshared/bitten/htdocs/excanvas.js
 # we don't need unit tests at run-time
 	rm -r $(CURDIR)/debian/trac-bitten/usr/share/pyshared/bitten/*/tests/
-	rm -f $(CURDIR)/debian/trac-bitten-slave/usr/share/pyshared/bitten/*/tests/
-# no x bits for HTML and PNG
+	rm -r $(CURDIR)/debian/trac-bitten-slave/usr/share/pyshared/bitten/*/tests/
+# no x bits for HTML and PNG, nor .py
 	chmod 644 `find $(CURDIR)/debian/trac-bitten/usr/share/ -name '*.html' -o -name '*.png'`
+	chmod 644 `find $(CURDIR)/debian/trac-bitten-slave/usr/share/ -name '*.py'`
 
 %.1: debian/%.dbk
 	$(XP) $(DB2MAN) $<