[Pkg-wmaker-commits] [wmacpi] 60/105: Imported Debian patch 2.2~rc4-2

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmacpi.

commit c3d386d8b237b4e3a9162e80892c2b4562fe2bb5
Author: Julien BLACHE <jblache at debian.org>
Date:   Sat Feb 13 09:26:32 2010 +0100

    Imported Debian patch 2.2~rc4-2
---
 debian/changelog | 13 +++++++++++++
 debian/control   |  6 +++---
 debian/copyright |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e14ef2a..216cbde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wmacpi (2.2~rc4-2) unstable; urgency=low
+
+  * debian/control:
+    + Build-depend on libxext-dev instead of x11proto-xext-dev to account for
+      changes in the X packaging (closes: #569362).
+    + Bump Standards-Version to 3.8.4 (no changes).
+    + Add ${misc:Depends}.
+
+  * debian/copyright:
+    + Refer explicitly to the GPL-2 file.
+
+ -- Julien BLACHE <jblache at debian.org>  Sat, 13 Feb 2010 09:26:32 +0100
+
 wmacpi (2.2~rc4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3d10095..fff74dd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: x11
 Priority: extra
 Maintainer: Julien BLACHE <jblache at debian.org>
 Build-Depends: debhelper (>= 5), dpatch, libx11-dev, libxpm-dev, x11proto-core-dev,
- x11proto-xext-dev, libdockapp-dev (>= 1:0.5.0)
-Standards-Version: 3.8.0
+ libxext-dev, libdockapp-dev (>= 1:0.5.0)
+Standards-Version: 3.8.4
 Homepage: http://himi.org/wmacpi/
 
 Package: wmacpi
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: wmaker
 Description: ACPI battery monitor for WindowMaker
  This is a battery monitor that uses ACPI to query the battery status.
diff --git a/debian/copyright b/debian/copyright
index ad44a81..fd8054e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,5 +35,5 @@ License:
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmacpi.git