debian: update packaging

diff --git a/README b/README
index 8696241bb4c6067d28fc15673e720f8b20770518..3a8a2250977fdcd60897f01bef1405b49c236552 100644 (file)
--- a/README
+++ b/README
@@ -10,8 +10,8 @@ Many little improvements have been made to i3lock over time:
   (run "i3lock && echo mem > /sys/power/state" to get a locked screen
    after waking up your computer from suspend to RAM)
 
-- You can either a background color or a PNG image which will be displayed
-  while your screen is locked.
+- You can specify either a background color or a PNG image which will be
+  displayed while your screen is locked.
 
 - You can specify whether i3lock should bell upon a wrong password.
 

diff --git a/debian/changelog b/debian/changelog
index 35a0c128066cf6fdb8830e04a3d2939339067607..a9f0b05155cb8523ab5cefb169c3d9bf514af2af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i3lock (2.0-0) unstable; urgency=low
+
+  * Complete rewrite of i3lock. Now using xcb instead of Xlib.
+
+ -- Michael Stapelberg <michael@stapelberg.de>  Fri, 16 Jul 2010 18:08:09 +0200
+
 i3lock (1.1-1) unstable; urgency=low
 
   * Implement background pictures (-i) and colors (-c)

diff --git a/debian/control b/debian/control
index 3460b7fa7e3be8d144d1630898798364482039d0..204b75033e6515f22cff90dbbf3fb34d2ce583f3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Michael Stapelberg <michael@stapelberg.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), libx11-dev, libpam0g-dev, libxext-dev, libxpm-dev
+Build-Depends: debhelper (>= 5), libx11-dev, libpam0g-dev, libcairo2-dev, libxcb1-dev, libxcb-dpms0-dev, libxcb-keysyms1-dev
 Standards-Version: 3.8.2
 Homepage: http://i3.zekjur.net/i3lock/
 
@@ -12,11 +12,16 @@ Architecture: any
 Priority: extra
 Section: x11
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: a slightly improved version of slock
- i3lock improves slock by making it fork() and therefore combinable with
- commands to suspend your computer. Additionally, instead of turning off
- your screen via DPMS and/or displaying a black screen, i3lock displays a
- white screen so you can see if your computer failed to resume from suspend
- or if your screen is just locked. Also, when entering a wrong password,
- i3lock does not call XBell(). This is important because i3lock/slock think
- you've entered a password when resuming from suspend, at least sometimes.
+Description: improved screen locker
+ i3lock is a simple screen locker like slock. After starting it, you will
+ see a white screen (you can configure the color/an image). You can return
+ to your screen by entering your passwords.
+ .
+ i3lock forks so you can combine it with an alias to suspend to RAM.
+ .
+ You can specify either a background color or a PNG image which will be
+ displayed while your screen is locked.
+ .
+ You can specify whether i3lock should bell upon a wrong password.
+ .
+ i3lock uses PAM and therefore is compatible with LDAP etc.

diff --git a/debian/copyright b/debian/copyright
index b05115dc16d2c4144957039e6ee7f277a1c07a36..f17aaa3a0e6df07e005853048bdfd98ca293d7cb 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,30 @@
 This Debian package is based on a tarball downloaded from
 http://i3.zekjur.net
 
-MIT/X Consortium License
+Copyright © 2010, Michael Stapelberg
+All rights reserved.
 
-© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
-© 2009 Michael Stapelberg <michael+i3lock at stapelberg dot de>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+    * 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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+    * Neither the name of Michael Stapelberg nor the
+      names of contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY Michael Stapelberg ''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 Michael Stapelberg 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.

diff --git a/debian/rules b/debian/rules
index fa91b71736abb4815ff884af1628e9f8b5580f47..2955d2a930ac50e4ed845e7fbb00e284612ae6d3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,15 +29,17 @@ clean:
        # Add here commands to clean up after the build process.
        [ ! -f Makefile ] || $(MAKE) clean 
 
-       dh_clean 
+       dh_prep
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/i3lock/ install
+       mkdir -p $(CURDIR)/debian/i3lock/usr/share/man/man1
+       cp i3lock.1 $(CURDIR)/debian/i3lock/usr/share/man/man1
 
 
 # Build architecture-independent files here.
@@ -50,25 +52,11 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs 
        dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-       dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-       dh_installinit
-#      dh_installcron
-#      dh_installinfo
        dh_installman
        dh_link
-#      dh_strip
+       dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol