update debian packaging, update copyright

diff --git a/LICENSE b/LICENSE
index bf78f1c20604f9bc27468194ac2f2281ed4a287d..c060226248d709fe878a3f1f8964448b4d2a8355 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2010, Michael Stapelberg
+Copyright © 2010-2011, Michael Stapelberg
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/debian/changelog b/debian/changelog
index 55b55664012050d72d6cd57918e02313fa655e70..08bd42081ebba7ecb6ffbf10b839fc7decc65877 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+i3lock (2.2-1) unstable; urgency=low
+
+  * Render to a pixmap which is used as background for the window instead of
+    copying contents on every expose event
+
+ -- Michael Stapelberg <michael@stapelberg.de>  Wed, 13 Jul 2011 16:59:32 +0200
+
 i3lock (2.1-1) unstable; urgency=low
 
   * Accept return/backspace when the buffer of 512 bytes is full

diff --git a/debian/control b/debian/control
index 89ed9d2eb9bf6b45ec778fd545629eeb442002ef..78a0abc099b0cd3b48fbd6139d55ec46f34d7ebd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: utils
 Priority: optional
 Maintainer: Michael Stapelberg <michael@stapelberg.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), libx11-dev, libpam0g-dev, libcairo2-dev, libxcb1-dev, libxcb-dpms0-dev, libxcb-keysyms1-dev, libxcb-image0-dev
-Standards-Version: 3.9.1
-Homepage: http://i3.zekjur.net/i3lock/
+Build-Depends: debhelper (>= 7), libx11-dev, libpam0g-dev, libcairo2-dev, libxcb1-dev, libxcb-dpms0-dev, libxcb-keysyms1-dev, libxcb-image0-dev, pkg-config
+Standards-Version: 3.9.2
+Homepage: http://i3wm.org/i3lock/
 
 Package: i3lock
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index e4a9b570288fb32219463672da6a21bdffc87914..4689acc107cc98243baafbf956f113dc4133d269 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This Debian package is based on a tarball downloaded from
-http://i3.zekjur.net/i3lock
+http://i3wm.org/i3lock
 
 Copyright © 2010-2011, Michael Stapelberg
 All rights reserved.

diff --git a/debian/rules b/debian/rules
index a9bafe44abc11c5190be2b34ea96089947003285..c35d8290e99f84b30e2c705ca2912c6a293e4fd5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,18 +13,19 @@ config.status: configure
        dh_testdir
        touch $@
 
-build:
-       dh_testdir
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
-       # Add here commands to compile the package.
+build-stamp:
+       dh_testdir
        $(MAKE)
-
        touch $@
 
 clean: 
        dh_testdir
        dh_testroot
-       rm -f build
+       rm -f build-stamp
        $(MAKE) clean
        dh_prep
        rm -f debian/files

diff --git a/i3lock.1 b/i3lock.1
index 7fb86a1ba1e5a74e8c23683350926c8cea7b0191..b0f45a407b6bc912855a85b97bb98f3bd1a3c088 100644 (file)
--- a/i3lock.1
+++ b/i3lock.1
@@ -8,7 +8,7 @@
 .fi
 ..
 
-.TH i3lock 1 "JULY 2010" Linux "User Manuals"
+.TH i3lock 1 "JULY 2011" Linux "User Manuals"
 
 .SH NAME
 i3lock \- improved screen locker