fixed some debian packaging stuff

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

diff --git a/debian/control b/debian/control
index a3b3a4f..0e925a0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: conky
 Section: utils
 Priority: optional
 Maintainer: Jason Tan <jtan325@gmail.com>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev
+Build-Depends: debhelper (>= 4.0.0), xlibs-dev, libxt-dev
 Standards-Version: 3.6.2
 
 Package: conky

diff --git a/debian/copyright b/debian/copyright
index d90f04e..5068f19 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,8 +7,27 @@ 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. 
-On Debian systems, the complete text of the 
-BSD License can be found in the file `/usr/share/common-licenses/BSD'.
+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

diff --git a/debian/rules b/debian/rules
index fdac833..1cea784 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,16 +23,14 @@ else
        CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
+config.status:
        dh_testdir
        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-double-buffer   --enable-own-window --enable-proc-uptime --enable-mpd --enable-xft --enable-seti
-       touch configure-stamp
 
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: config.status
        dh_testdir
 
        $(MAKE)
@@ -44,8 +42,8 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       rm -f config.cache config.status config.log
        -$(MAKE) clean
+       -$(MAKE) distclean
 
        dh_clean