[equivs] 08/36: Import Debian version 2.0.10~exp1

Axel Beckert abe at deuxchevaux.org
Fri Jul 28 23:04:34 UTC 2017 

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

abe pushed a commit to branch master
in repository equivs.

commit 72410873172db93b58e36b5452d7549709d815c0
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Fri Apr 21 19:20:01 2017 +0900

    Import Debian version 2.0.10~exp1
    
    equivs (2.0.10~exp1) experimental; urgency=medium
    
      * QA upload. (See: #852223)
      * Strip subdirectories before installing file listed in "Files:".
        Thanks to RjY <rjy at users.sourceforge.net> and
        Euan Thoms <euan at potensol.com>. (Closes: #662946)
      * Fix that equivs-build doesn't work if & is part of PWD.
        Thanks to Martin Mrazik and era eriksson <era at iki.fi>.
        (Closes: #679101) (LP: #881153, #1016402)
      * debian/README.Debian:
        - Fix references. Thanks to Regid Ichira <regid23 at nt1.in>
          (Closes: #724608)
      * debian/rules:
        - Thanks to Reiner Herrmann <reiner at reiner-h.de>, this package should be
          reproducible now. (Closes: #786714)
      * debian/copyright:
        - Make DEP5 copyright
      * debian/{control,compat}
        - Bump debhelper compat level to 9 (no change required).
      * Bump versions in template (no change required):
        - standard version to 3.9.8
        - debhelper compat level to 9
        - source version to 3.0 (quilt)
      * debian/control:
        - Bump stardard version to 3.9.8 (no change required)
        - Set Maintainer as "Debian QA Group <packages at qa.debian.org>"
          This is the first time to do QA upload for this package.
      * debian/source/format:
        - Bump to 3.0 (native).
---
 debian/README.Debian                           |  6 ++--
 debian/changelog                               | 32 +++++++++++++++++++++
 debian/compat                                  |  2 +-
 debian/control                                 |  6 ++--
 debian/copyright                               | 39 ++++++++++++++++++--------
 debian/rules                                   |  3 +-
 debian/source/format                           |  2 +-
 usr/bin/equivs-build                           |  4 +--
 usr/share/equivs/template/debian/compat        |  2 +-
 usr/share/equivs/template/debian/control.in    |  4 +--
 usr/share/equivs/template/debian/source/format |  2 +-
 11 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index c53f8f8..512bb72 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -41,7 +41,7 @@ When you call the "equivs-build" program, it will create a
 subdirectory "equivs", containing the files necessary to create
 a Debian package and build that package.
 
-You need a control file for make-equivs. You will find examples
+You need a control file for equivs-build. You will find examples
 of control files in /usr/share/doc/equivs/examples.
 
 The control file has a structure like the control files in "real"
@@ -49,9 +49,9 @@ Debian packages, but it doesn't have to define all keys, as default
 values will be used if you omit one. See the manual page for
 "equivs-build" for more information.
 
-Check the Debian Policy Manual, Chapter 2, if you are unsure 
+Check the Debian Policy Manual, Chapter 7, if you are unsure
 about the different level of package relationships (dependencies)
-http://www.debian.org/doc/debian-policy/ch-archive.html
+http://www.debian.org/doc/debian-policy/ch-relationships.html
 (also available in the debian-policy package).
 
 The program "equivs-control" will create a dummy control file,
diff --git a/debian/changelog b/debian/changelog
index e193e22..25eb842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+equivs (2.0.10~exp1) experimental; urgency=medium
+
+  * QA upload. (See: #852223)
+  * Strip subdirectories before installing file listed in "Files:".
+    Thanks to RjY <rjy at users.sourceforge.net> and
+    Euan Thoms <euan at potensol.com>. (Closes: #662946)
+  * Fix that equivs-build doesn't work if & is part of PWD.
+    Thanks to Martin Mrazik and era eriksson <era at iki.fi>.
+    (Closes: #679101) (LP: #881153, #1016402)
+  * debian/README.Debian:
+    - Fix references. Thanks to Regid Ichira <regid23 at nt1.in>
+      (Closes: #724608)
+  * debian/rules:
+    - Thanks to Reiner Herrmann <reiner at reiner-h.de>, this package should be
+      reproducible now. (Closes: #786714)
+  * debian/copyright:
+    - Make DEP5 copyright
+  * debian/{control,compat}
+    - Bump debhelper compat level to 9 (no change required).
+  * Bump versions in template (no change required):
+    - standard version to 3.9.8
+    - debhelper compat level to 9
+    - source version to 3.0 (quilt)
+  * debian/control:
+    - Bump stardard version to 3.9.8 (no change required)
+    - Set Maintainer as "Debian QA Group <packages at qa.debian.org>"
+      This is the first time to do QA upload for this package.
+  * debian/source/format:
+    - Bump to 3.0 (native).
+
+ -- Roger Shimizu <rogershimizu at gmail.com>  Fri, 21 Apr 2017 19:20:01 +0900
+
 equivs (2.0.9+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 9c53df5..7a61ac9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: equivs
 Section: admin
 Priority: extra
-Maintainer: Peter Samuelson <peter at p12n.org>
-Standards-Version: 3.9.2
-Build-Depends: debhelper
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 9)
 
 Package: equivs
 Depends: perl, debhelper, dpkg-dev, make, fakeroot, ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index 7ce39bc..3c1af9f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,29 @@
-Copyright 1997, 1998 by Christian Schwarz
-Copyright 1997 by Paul Seelig <pseelig at goofy.zdv.uni-mainz.de>
-Copyright 1999 by Martin Bialasinski <agr30 at uni-koeln.de>
-Copyright 2003 by Fabio Rafael da Rosa <f2r at users.sourceforge.net>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-This package is free software; you can redistribute and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-On Debian systems, the full text of the license can be found at
-/usr/share/common-licenses/GPL-2 .
+Files: *
+Copyright:
+ 1997-1998 Christian Schwarz
+ 1997 Paul Seelig <pseelig at goofy.zdv.uni-mainz.de>
+ 1999-2001 Martin Bialasinski  <agr30 at uni-koeln.de>
+ 2003 Fabio Rafael da Rosa <f2r at users.sourceforge.net>
+ 2004 Steve M. Robbins <smr at debian.org>
+ 2006,2010,2011 Peter Samuelson <peter at p12n.org>
+ 2008 Stefano Zacchiroli <zack at debian.org>
+ 2015 Wookey <wookey at debian.org>
+ 2017 Roger Shimizu <rogershimizu at gmail.com>
+License: GPL-2+
+ 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 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/rules b/debian/rules
index 7d54ec4..cb2563f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,10 @@
 #export DH_VERBOSE=1
 PKG := equivs
 MANPAGES := debian/equivs-control.1 debian/equivs-build.1
+BUILD_DATE = $(shell dpkg-parsechangelog -S Date)
 
 %.1: %.pod
-	pod2man --section=1 --release="$$(date +'%d %b %Y')" \
+	pod2man --section=1 --release="$$(LC_ALL=C date -u +'%d %b %Y' -d '$(BUILD_DATE)')" \
 	--center="Debian/GNU" --date=' ' $< > $@
 
 build-arch:
diff --git a/debian/source/format b/debian/source/format
index d3827e7..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (native)
diff --git a/usr/bin/equivs-build b/usr/bin/equivs-build
index 2000f21..68a5f46 100755
--- a/usr/bin/equivs-build
+++ b/usr/bin/equivs-build
@@ -46,7 +46,7 @@ if (! $controlfile) {
   usage();
 }
 
-system("cp -R /usr/share/equivs/template/* $builddir") == 0 or
+system("cp -R /usr/share/equivs/template/* \"$builddir\"") == 0 or
   die "Error on copy of the template files: exit status " . ($?>>8) . "\n";
 
 # Parse the equivs control file
@@ -67,7 +67,7 @@ my %install_files = ();
 for (split "\n", $control{'Files'} || "") {
     die "Cannot parse Files line: '$_'\n"
         unless m:^\s*(\S+)\s+(\S+)/?\s*$:;
-    $install_files{"$2/$1"} = $1;
+    $install_files{"$2/".basename($1)} = $1;
 }
 my %create_files = ();
 for (@{$control{'File'} || []}) {
diff --git a/usr/share/equivs/template/debian/compat b/usr/share/equivs/template/debian/compat
index 7f8f011..ec63514 100644
--- a/usr/share/equivs/template/debian/compat
+++ b/usr/share/equivs/template/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/usr/share/equivs/template/debian/control.in b/usr/share/equivs/template/debian/control.in
index df0af8b..c640e36 100644
--- a/usr/share/equivs/template/debian/control.in
+++ b/usr/share/equivs/template/debian/control.in
@@ -1,8 +1,8 @@
 Section: misc
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
 Maintainer: root <root at localhost>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.8
 
 Package: equivs-dummy
 Architecture: all
diff --git a/usr/share/equivs/template/debian/source/format b/usr/share/equivs/template/debian/source/format
index d3827e7..163aaf8 100644
--- a/usr/share/equivs/template/debian/source/format
+++ b/usr/share/equivs/template/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

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

More information about the Pkg-perl-cvs-commits mailing list