changed some debian stuff so it's 1.3.1 ready for repos

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@319 7f574dfc-610e-0410-a909-a81674777703

diff --git a/debian/changelog b/debian/changelog
index f245f81..dcec80d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
+conky (1.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Added libxt-dev to build-depends in debian/control (closes: #327306)
+  * Fixed the double BSD-license in debian/copyright (closes: #327135)
+
+ -- Jason Tan <jtan325@gmail.com>  Sat, 10 Sep 2005 22:45:51 -0700
+
 conky (1.3.0-1) unstable; urgency=low
 
-  * Initial Release (Closes: #320978).
+  * Initial Release. (closes: #320978)
 
  -- Jason Tan <jtan325@gmail.com>  Wed, 24 Aug 2005 00:10:49 -0700
 

diff --git a/debian/copyright b/debian/copyright
index 5068f19..49c2f65 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,27 +7,6 @@ Copyright: This software is copyright (c) 2004-2005 by Brenden Matthews.
 
 Upstream Author: Brenden Matthews <brenden@rty.ca>
 
-You are free to distribute this software under the terms of the BSD License:
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-                       this list of conditions and the following disclaimer.
-    * 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.
-    * Neither the name of Conky nor the names of its contributors may be used to 
-                       endorse or promote products derived from this software without specific 
-                       prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
\ No newline at end of file
+You are free to distribute this software under the terms of the BSD License. 
+On Debian systems, the complete text of the BSD License can be found in the 
+file `/usr/share/common-licenses/BSD'.
\ No newline at end of file