meta fixes

diff --git a/debian/changelog b/debian/changelog
index fa52309a9cdcbfc7905160b8beb06adf68a4f9fb..1c2a5e14b1ce198c8b3b99ed18820f976a87c40f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,16 +4,17 @@ userv (1.1.0~~iwj) unstable; urgency=low
   * Do not reject comments and blank lines inside not-being-executed
     conditional clauses.  (Closes: #613862.)
 
   * Do not reject comments and blank lines inside not-being-executed
     conditional clauses.  (Closes: #613862.)
 

-  General improvements:
+  General improvements (relevant outside Debian):

   * Introduce a use of socklen_t to avoid a compiler warning.
   * Remove spec.html and spec.ps from revision control.
   * Revision control switched from cvs to git.
   * Introduce a use of socklen_t to avoid a compiler warning.
   * Remove spec.html and spec.ps from revision control.
   * Revision control switched from cvs to git.

+  * Update my email address.

 
 

+  Debian packaging improvements:

   * Remove /var/run/userv from the .deb.
     (Along with the change in 1.0.6, Closes: #630528.)
   * The new version will ensure a rebuild and therefore completely deal
     with the debiandoc-sgml missing documentation bug.  (Closes: #413873.)
   * Remove /var/run/userv from the .deb.
     (Along with the change in 1.0.6, Closes: #630528.)
   * The new version will ensure a rebuild and therefore completely deal
     with the debiandoc-sgml missing documentation bug.  (Closes: #413873.)

-  * Update my email address.

 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 02 Jun 2012 15:44:16 +0100
 
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 02 Jun 2012 15:44:16 +0100
 

diff --git a/debian/copyright b/debian/copyright
index a08b87f386586e003bb5bbddfb0c4ff2380d3f78..ee19daca98ef4bbe82487716985dbb22b7ca62d7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,18 +2,17 @@ This is Debian GNU/Linux's prepackaged version of Ian Jackson's
 `userv' system utility.
 
 This package was put together from the upstream sources by the
 `userv' system utility.
 
 This package was put together from the upstream sources by the

-upstream author.  Please contact Ian Jackson at
-<ian@davenant.greenend.org.uk> for matters relating to the Debian
-package in particular or <userv-maint@chiark.greenend.org.uk> for
-general enquiries about userv.
+upstream author.  If you have queries please contact Ian Jackson at
+<ijackson@chiark.greenend.org.uk>; use the Debian bug system for bugs
+if possible.

 
 The changes were to add support for the Debian package maintenance
 scheme, by adding various debian/* files and arranging for the uservd
 daemon to be started automatically.
 
 
 
 The changes were to add support for the Debian package maintenance
 scheme, by adding various debian/* files and arranging for the uservd
 daemon to be started automatically.
 
 

-Copyright (C)1996-2000,2006 Ian Jackson <ian@davenant.greenend.org.uk>.
-Copyright (C)2000           Ben Harris <bjh21@cam.ac.uk>.
+Copyright (C)1996-2000,2006,2012 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright (C)2000                Ben Harris <bjh21@cam.ac.uk>.

 
 userv 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
 
 userv 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