lintian fixes

diff --git a/debian/changelog b/debian/changelog
index c5a926a73a5ac0328b4b7534be2129daebe0512d..830ae1fc5f672d0fb4bb712d344f2db1d74c8f65 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,12 @@ userv (1.1.0~~iwj) unstable; urgency=low
     (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.)
+  * Use lintian for dh_fixperms; this ensures that the permissions of
+    /etc/userv in the .deb are 755, not 2755.
   * Use `command -v' instead of `type' in maintainer scripts.
   * Do not ignore errors from commands in rules clean target.
+  * Fix FSF address in copyright file.
+  * Remove obsolete local variable section from debian/changelog.
   * Update Standards-Version.  No changes required.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 02 Jun 2012 15:44:16 +0100
@@ -386,7 +390,3 @@ userv (0.55.1-1) experimental; urgency=low
   * Initial Debian release.
 
  -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 22 Sep 1997 01:08:23 +0100
-
-# Local variables:
-# mode: debian-changelog
-# End:

diff --git a/debian/control b/debian/control
index df5c5d61a6015b97147cb9c7586493ca68675479..0f19a35272a42d8449085052fffff677808b2fe1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: userv
 Section: admin
 Priority: optional
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Build-Depends: debiandoc-sgml, texlive, texlive-latex-extra
+Build-Depends: debiandoc-sgml, texlive, texlive-latex-extra, debhelper (>= 5)
 Standards-Version: 3.9.1
 
 Package: userv

diff --git a/debian/copyright b/debian/copyright
index ee19daca98ef4bbe82487716985dbb22b7ca62d7..018cef83d977593d22a701a4fee0e40b28e72970 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,5 +27,4 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License with
 your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
 the Debian GNU/Linux userv source package as the file COPYING; if not,
-email me at one of the addresses above or write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+see <http://www.gnu.org/licenses/> or email me.

diff --git a/debian/rules b/debian/rules
index 05edd5f77fbae685c591fd46de5fa60a5ccd6e5a..6b91ff91f2e6d0f2468a80fcf8cfee51ab2842b7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -55,8 +55,9 @@ binary-arch:  checkroot build
        cp debian/lintian $t/usr/share/lintian/overrides/userv
        dpkg-shlibdeps daemon client
        dpkg-gencontrol -isp
-       chown -R root.root $t
-       chmod -R og=rX $t
+       dh_fixperms -Pdebian/tmp
+       chown root.root debian/tmp/usr/bin/userv
+       chmod 4755 debian/tmp/usr/bin/userv
        dpkg --build $t ..
 
 define checkdir