[Pkg-doc-linux-devel] r170 - in trunk/doc-linux/debian: . copyrights/free copyrights/non-free

[Frank Lichtenheld]

Author: djpig
Date: 2005-07-22 13:13:35 +0000 (Fri, 22 Jul 2005)
New Revision: 170

Added:
   trunk/doc-linux/debian/copyrights/free/Battery-Powered
Modified:
   trunk/doc-linux/debian/copyrights/non-free/OPL-1.0-no-options
   trunk/doc-linux/debian/doc-linux.changelog
   trunk/doc-linux/debian/doc-linux.control
Log:
- Begin new changelog entry
- The Battery-Powered HOWTO changed its license from OPL to a custom
  one and is free now. Move the files and adapt the Replaces


Added: trunk/doc-linux/debian/copyrights/free/Battery-Powered
===================================================================
--- trunk/doc-linux/debian/copyrights/free/Battery-Powered	2005-07-22 12:54:54 UTC (rev 169)
+++ trunk/doc-linux/debian/copyrights/free/Battery-Powered	2005-07-22 13:13:35 UTC (rev 170)
@@ -0,0 +1,16 @@
+HOWTO: Battery-Powered
+
+Copyright (c) 2003 David Lechnyr. Redistribution and use, with or without
+modification, are permitted provided that the copyright notice, this list of
+conditions and the following disclaimer be included.
+
+THIS DOCUMENTATION IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.

Modified: trunk/doc-linux/debian/copyrights/non-free/OPL-1.0-no-options
===================================================================
--- trunk/doc-linux/debian/copyrights/non-free/OPL-1.0-no-options	2005-07-22 12:54:54 UTC (rev 169)
+++ trunk/doc-linux/debian/copyrights/non-free/OPL-1.0-no-options	2005-07-22 13:13:35 UTC (rev 170)
@@ -1,6 +1,5 @@
 HOWTO: Adv-Routing-HOWTO
 HOWTO: Apache-Overview-HOWTO
-HOWTO: Battery-Powered
 HOWTO: DHCP
 HOWTO: Lex-YACC-HOWTO
 HOWTO: NFS-HOWTO

Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog	2005-07-22 12:54:54 UTC (rev 169)
+++ trunk/doc-linux/debian/doc-linux.changelog	2005-07-22 13:13:35 UTC (rev 170)
@@ -1,3 +1,13 @@
+doc-linux (2005.07-1) UNRELEASED; urgency=low
+
+  * new upstream release (20050722)
+  * Updated HOWTOs:
+    Battery-Powered 
+  * The Battery-Powered HOWTO changed its license from OPL to a custom
+    one and is free now. Move the files and adapt the Replaces
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 22 Jul 2005 15:11:49 +0200
+
 doc-linux (2005.06-1) unstable; urgency=low
 
   * new upstream release (20050609)

Modified: trunk/doc-linux/debian/doc-linux.control
===================================================================
--- trunk/doc-linux/debian/doc-linux.control	2005-07-22 12:54:54 UTC (rev 169)
+++ trunk/doc-linux/debian/doc-linux.control	2005-07-22 13:13:35 UTC (rev 170)
@@ -11,7 +11,7 @@
 Priority: optional
 Architecture: all
 Conflicts: doc, dhelp (<< 0.3.14), doc-linux
-Replaces: doc-linux, doc-linux-text (<< 98.06-1), doc-linux-nonfree-html (<< 2004.09-1)
+Replaces: doc-linux, doc-linux-text (<< 98.06-1), doc-linux-nonfree-html (<< 2005.07-1)
 Suggests: doc-base, menu, www-browser
 Description: Linux HOWTOs and FAQs in HTML format
  The doc-linux-html package provides the current Linux HOWTOs and FAQs in
@@ -29,7 +29,7 @@
 Package: doc-linux-text
 Architecture: all
 Conflicts: doc, doc-linux
-Replaces: doc-linux, doc-linux-html (<< 98.06-1), doc-linux-nonfree-text (<< 2004.09-1)
+Replaces: doc-linux, doc-linux-html (<< 98.06-1), doc-linux-nonfree-text (<< 2005.07-1)
 Suggests: doc-linux-html
 Description: Linux HOWTOs and FAQs in ASCII format
  The doc-linux-text package provides the current Linux HOWTOs and FAQs in