debian/control, debian/copyright, debian/opensc-pkcs11.install, debia…

…n/opensc.docs, debian/opensc.install: Run wrap-and-sort.
marschap · May 16, 2015 · 2882bd3 · 2882bd3
1 parent 2aa8f2e
commit 2882bd3
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 43 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -4,6 +4,8 @@ opensc (0.14.0-3) unstable; urgency=medium
   * debian/control: Switch maintainer to
     pkg-opensc-maint@lists.alioth.debian.org and mark myself as uploader.
   * debian/control: Standards-Version to 3.9.6.
+  * debian/control, debian/copyright, debian/opensc-pkcs11.install,
+    debian/opensc.docs, debian/opensc.install: Run wrap-and-sort.
 
  --
 

diff --git a/debian/control b/debian/control
@@ -3,9 +3,17 @@ Priority: extra
 Section: utils
 Maintainer: Debian OpenSC Maintainers <pkg-opensc-maint@lists.alioth.debian.org>
 Uploaders: Eric Dorland <eric@debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, docbook-xsl, flex,
- libltdl3-dev, libpcsclite-dev (>= 1.2.9-beta1), libreadline-dev,
- libssl-dev (>= 0.9.7d-3), pkg-config, xsltproc, zlib1g-dev
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               docbook-xsl,
+               flex,
+               libltdl3-dev,
+               libpcsclite-dev (>= 1.2.9-beta1),
+               libreadline-dev,
+               libssl-dev (>= 0.9.7d-3),
+               pkg-config,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: https://github.com/OpenSC/OpenSC/wiki
 Vcs-Git: git://anonscm.debian.org/pkg-opensc/opensc.git
@@ -16,7 +24,9 @@ Section: utils
 Architecture: any
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, opensc-pkcs11 (= ${binary:Version})
+Depends: opensc-pkcs11 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Conflicts: mozilla-opensc
 Description: Smart card utilities with support for PKCS#15 compatible cards
  OpenSC provides a set of libraries and utilities to access smart
@@ -42,9 +52,9 @@ Section: utils
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: opensc (<< 0.13.0-5~), libopensc2 (<< 0.12.0)
-Breaks: opensc (<< 0.13.0-5~), libopensc2 (<< 0.12.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libopensc2 (<< 0.12.0), opensc (<< 0.13.0-5~)
+Breaks: libopensc2 (<< 0.12.0), opensc (<< 0.13.0-5~)
 Description: Smart card utilities with support for PKCS#15 compatible cards
  OpenSC provides a set of libraries and utilities to access smart
  cards.  It mainly focuses on cards that support cryptographic

diff --git a/debian/copyright b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: opensc-devel@lists.sourceforge.net
 Source: https://github.com/OpenSC/OpenSC
 
 Files: *
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
 License: LGPL-2.1+
 
 Files: src/libopensc/authentic.h
@@ -63,7 +63,7 @@ Files: src/pkcs11/framework-pkcs15.c
  src/pkcs11/pkcs11-object.c
  src/pkcs11/pkcs11-session.c
  src/pkcs11/sc-pkcs11.h
-Copyright: 2001-2002, Timo Ter�s <timo.teras@iki.fi>
+Copyright: 2001-2002, Timo Teräs <timo.teras@iki.fi>
 License: LGPL-2.1+
 
 Files: src/scconf/*
@@ -98,7 +98,7 @@ Files: src/tests/lottery.c
  src/tests/print.c
  src/tests/prngtest.c
  src/tests/sc-test.c
-Copyright:  2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright:  2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-westcos.c
@@ -118,7 +118,7 @@ License: LGPL-2.1+
 Files: src/libopensc/ef-atr.c
  src/pkcs15init/pkcs15-authentic.c
  src/pkcs15init/pkcs15-iasecc.c
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2010, Viktor Tarasov <vtarasov@opentrust.com>
 License: LGPL-2.1+
 
@@ -164,7 +164,7 @@ License: LGPL-2.1+
 
 Files: src/libopensc/log.c
  src/libopensc/log.h
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2003, Antti Tapaninen <aet@cc.hut.fi>
 License: LGPL-2.1+
 
@@ -191,7 +191,7 @@ License: LGPL-2.1+
 
 Files: src/libopensc/pkcs15-skey.c
  src/pkcs15init/pkcs15-oberthur.c
-Copyright: 2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2009, 2011, Viktor Tarasov <viktor.tarasov@opentrust.com>
 License: LGPL-2.1+
 
@@ -266,31 +266,31 @@ Copyright: 2003, Olaf Kirch <okir@suse.de>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-itacns.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2002, Andreas Jellinghaus <aj@dungeon.inka.de>
   2005, ST Incard srl, Giuseppe Amato <giuseppe.amato@st.com>, <midori3@gmail.com>
   2008-2010, Emanuele Pucciarelli <ep@acm.org>
 License: LGPL-2.1+
 
 Files: src/tools/cardos-tool.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2003, 2008, Andreas Jellinghaus <aj@dungeon.inka.de>
   2007, Jean-Pierre Szikora <jean-pierre.szikora@uclouvain.be>
 License: LGPL-2.1+
 
 Files: src/tools/pkcs15-tool.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2008, Andreas Jellinghaus <aj@dungeon.inka.de>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-cardos.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2002, Andreas Jellinghaus <aj@dungeon.inka.de>
   2005, Nils Larsch <nils@larsch.net>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-incrypto34.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2002, Andreas Jellinghaus <aj@dungeon.inka.de>
   2005, ST Incard srl, Giuseppe Amato <giuseppe.amato@st.com>, <midori3@gmail.com>
 License: LGPL-2.1+
@@ -322,7 +322,7 @@ Copyright: 2005, Antti Tapaninen <aet@cc.hut.fi>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-setcos.c
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2005, Antti Tapaninen <aet@cc.hut.fi>
   2005, Zetes
 License: LGPL-2.1+
@@ -345,14 +345,14 @@ Copyright: 2005, Douglas E. Engert <deengert@anl.gov>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-piv.c
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2005-2010, Douglas E. Engert <deengert@anl.gov>
   2006, Identity Alliance, Thomas Harning <thomas.harning@identityalliance.com>
   2007, EMC, Russell Larner <rlarner@rsa.com>
 License: LGPL-2.1+
 
 Files: src/tools/piv-tool.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2005,2010, Douglas E. Engert <deengert@anl.gov>
 License: LGPL-2.1+
 
@@ -379,55 +379,55 @@ Copyright: 2002, Juha Yrjola <juha.yrjola@iki.fi>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-mcrd.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2002, g10 Code GmbH
   2003, Marie Fischer <marie@vtl.ee>
   2004, Martin Paljak <martin@martinpaljak.net>
   2004, Priit Randla <priit.randla@eyp.ee>
 License: LGPL-2.1+
 
 Files: src/libopensc/reader-pcsc.c
-Copyright: 2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2009-2010, Martin Paljak <martin@martinpaljak.net>
 License: LGPL-2.1+
 
 Files: src/libopensc/padding.c
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2003, - 2007, Nils Larsch <larsch@trustcenter.de>
 License: LGPL-2.1+
 
 Files: src/libopensc/pkcs15-sec.c
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2007, Nils Larsch <nils@larsch.net>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-tcos.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2002, g10 Code GmbH
   2011, Peter Koch <pk@opensc-project.org>
 License: LGPL-2.1+
 
 Files: src/tools/iasecc-tool.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2011, Viktor TARASOV <viktor.tarasov@gmail.com>
 License: LGPL-2.1+
 
 Files: src/libopensc/card-oberthur.c
-Copyright: 2001-2002, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001-2002, Juha Yrjölä <juha.yrjola@iki.fi>
   2009, Viktor Tarasov <viktor.tarasov@opentrust.com>
 License: LGPL-2.1+
 
 Files: src/tools/sc-hsm-tool.c
-Copyright: 2001, Juha Yrj�l� <juha.yrjola@iki.fi>
+Copyright: 2001, Juha Yrjölä <juha.yrjola@iki.fi>
   2012, www.CardContact.de, Andreas Schwier, Minden, Germany
 License: LGPL-2.1+
 
 Files: src/libopensc/card-starcos.c
-Copyright: 2003, J�rn Zukowski <zukowski@trustcenter.de> and
+Copyright: 2003, Jörn Zukowski <zukowski@trustcenter.de> and
 License: LGPL-2.1+
 
 Files: src/pkcs11/slot.c
-Copyright: 2002, Timo Ter�s <timo.teras@iki.fi>
+Copyright: 2002, Timo Teräs <timo.teras@iki.fi>
   2009, Martin Paljak <martin@martinpaljak.net>
 License: LGPL-2.1+
 
@@ -479,7 +479,7 @@ Copyright: 2003, Zetes Belgium
 License: LGPL-2.1+
 
 Files: src/common/compat_getopt_main.c
-Copyright: 
+Copyright:
 License: Public domain
 
 Files: src/common/compat_strlcpy.h
@@ -530,4 +530,3 @@ License: ISC
  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
diff --git a/debian/opensc-pkcs11.install b/debian/opensc-pkcs11.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/*/lib*.so.*
 debian/tmp/usr/lib/*/*pkcs11*.so
-debian/tmp/usr/lib/*/pkcs11/*.so
+debian/tmp/usr/lib/*/lib*.so.*
+debian/tmp/usr/lib/*/pkcs11/*.so
diff --git a/debian/opensc.docs b/debian/opensc.docs
@@ -1,2 +1,2 @@
-doc/tools/tools.html
 
+doc/tools/tools.html
diff --git a/debian/opensc.install b/debian/opensc.install
@@ -1,32 +1,32 @@
+
+
 debian/tmp/usr/bin/cardos-tool
 debian/tmp/usr/bin/cryptoflex-tool
 debian/tmp/usr/bin/dnie-tool
 debian/tmp/usr/bin/eidenv
 debian/tmp/usr/bin/iasecc-tool
 debian/tmp/usr/bin/netkey-tool
 debian/tmp/usr/bin/openpgp-tool
-debian/tmp/usr/bin/opensc-tool
 debian/tmp/usr/bin/opensc-explorer
+debian/tmp/usr/bin/opensc-tool
 debian/tmp/usr/bin/piv-tool
 debian/tmp/usr/bin/pkcs11-tool
 debian/tmp/usr/bin/pkcs15*
 debian/tmp/usr/bin/sc-hsm-tool
 debian/tmp/usr/bin/westcos-tool
-
-debian/tmp/usr/share/opensc/*.profile
-etc/opensc.conf etc/opensc
-
-debian/tmp/usr/share/man/man5/*
 debian/tmp/usr/share/man/man1/cardos-tool.1
 debian/tmp/usr/share/man/man1/cryptoflex-tool.1
 debian/tmp/usr/share/man/man1/eidenv.1
 debian/tmp/usr/share/man/man1/iasecc-tool.1
 debian/tmp/usr/share/man/man1/netkey-tool.1
 debian/tmp/usr/share/man/man1/openpgp-tool.1
-debian/tmp/usr/share/man/man1/opensc-tool.1
 debian/tmp/usr/share/man/man1/opensc-explorer.1
+debian/tmp/usr/share/man/man1/opensc-tool.1
 debian/tmp/usr/share/man/man1/piv-tool.1
 debian/tmp/usr/share/man/man1/pkcs11-tool.1
 debian/tmp/usr/share/man/man1/pkcs15*.1
 debian/tmp/usr/share/man/man1/sc-hsm-tool.1
 debian/tmp/usr/share/man/man1/westcos-tool.1
+debian/tmp/usr/share/man/man5/*
+debian/tmp/usr/share/opensc/*.profile
+etc/opensc.conf etc/opensc