[libx11-protocol-other-perl] 02/02: Corrected packaging issues pointed out by Gregor Hermann

[Dima Kogan]

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

dkogan-guest pushed a commit to branch master
in repository libx11-protocol-other-perl.

commit 94ee374dcef21d64c52098593c5e711c718b6785
Author: Dima Kogan <dima at secretsauce.net>
Date:   Thu Jan 16 11:34:38 2014 -0800

    Corrected packaging issues pointed out by Gregor Hermann
    
    - better versioning of debhelper dependencies
    - running tests inside an xvfb
    - small debian/copyright corrections
---
 debian/changelog | 26 +-------------------------
 debian/control   |  8 +++++---
 debian/copyright | 20 ++++++++++++++++++--
 debian/rules     | 11 ++---------
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc14358..4afdeec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,4 @@
-libx11-protocol-other-perl (28-1) UNRELEASED; urgency=low
-
-  TODO:
-  - d/rules: I'm not sure about unsetting DISPLAY; the tests pass for me with
-    xvfb (like in http://paste.debian.net/76599/ for the other package); but
-    if they are fragile and somehow tied to a window manager it might be ok
-  - debian/ in upstream: instead of manually removing the files, you can also
-    add a file debian/gbp.conf with
-      [git-import-orig]
-      filter = debian
-    then the next import will skip the debian/ directory
-    (no sure if the patch is really needed but it doesn't hurt. except that it
-    won't apply the next time ... maybe adding "Forwarded: not-needed" might
-    be nice)
-  - d/copyright:
-    + missing years of upstream copyright
-    + license for debian/*: we usually use the superset of $upstream-license
-      and $same-as-perl, so "GPL-3+ or Artistic or GPL-1+" in this case.
-      but that's of course your decision.
-  - d/control:
-    + debhelper version -> see other package
-    + short description: should start with small letter (unless proper noun)
-      --> "miscellaneous ..." (or "collection of misc. helpers ...")
-    + a test whines about a missing Encode::HanExtra --> adding
-      libencode-hanextra-perl to B-D-I might help (haven't tried)
+libx11-protocol-other-perl (28-1) unstable; urgency=low
 
   * Initial Release. (Closes: #735257)
 
diff --git a/debian/control b/debian/control
index 7e4ab71..f5f880d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,11 @@ Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Dima Kogan <dima at secretsauce.net>
-Build-Depends: debhelper (>= 9.20120312),
+Build-Depends: debhelper (>=8),
  libx11-protocol-perl,
- perl
+ perl,
+ libencode-hanextra-perl,
+ xauth, xvfb
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libx11-protocol-other-perl.git
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libx11-protocol-other-perl.git
@@ -15,7 +17,7 @@ Package: libx11-protocol-other-perl
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
  libx11-protocol-perl
-Description: Miscellaneous X11::Protocol helpers
+Description: miscellaneous X11::Protocol helpers
  X11::Protocol::Other provides some miscellaneous extras and helpers for
  X11::Protocol. Modules provided are:
  .
diff --git a/debian/copyright b/debian/copyright
index 434d30b..811c9f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,28 @@ Upstream-Contact: Kevin Ryde <user42 at zip.com.au>
 Upstream-Name: X11::Protocol::Other
 
 Files: *
-Copyright: Kevin Ryde <user42 at zip.com.au>
+Copyright: 2011-2013, Kevin Ryde <user42 at zip.com.au>
 License: GPL-3+
 
 Files: debian/*
 Copyright: 2014, Dima Kogan <dima at secretsauce.net>
-License: GPL-3+
+License: GPL-1+ or Artistic
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
diff --git a/debian/rules b/debian/rules
index 670b6a0..c242220 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,6 @@
 %:
 	dh $@
 
-# This is done to disable any tests that actually use the X server. Those are
-# somewhat error prone, anyway, since they depend on the specific window manager
-#
-# Also, this is needed because of
-#  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589687
-# since pbuilder/cowbuilder would inherit the caller's DISPLAY even if no X server
-# exists there
-unexport DISPLAY
+# The tests need an X server. This provides one even inside a chroot
 override_dh_auto_test:
-	dh_auto_test
+	xvfb-run -a dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libx11-protocol-other-perl.git