d/control: Add myself as Uploader

Also run wrap-and-sort for consistency

diff --git a/debian/control b/debian/control
index 6724a89ae1bf6d2f440e27e101ada78d49fd7d35..bb2d6ae6bafac0f6ea26da05d44011c160b29b65 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,11 @@
 Source: dcmtk
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
-Uploaders: Gert Wollny <gewo@debian.org>
+Uploaders: Gert Wollny <gewo@debian.org>, Mathieu Malaterre <malat@debian.org>
 Section: science
 Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               gettext,
                help2man,
                libpng-dev,
                libsndfile1-dev,
@@ -12,10 +13,8 @@ Build-Depends: cmake,
                libtiff-dev,
                libwrap0-dev,
                libxml2-dev,
-               gettext,
                zlib1g-dev
-Build-Depends-Indep: doxygen,
-                     graphviz
+Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/dcmtk
 Vcs-Git: https://salsa.debian.org/med-team/dcmtk.git
@@ -23,9 +22,7 @@ Homepage: http://dicom.offis.de/dcmtk
 
 Package: dcmtk
 Architecture: any
-Depends: adduser,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
 Description: OFFIS DICOM toolkit command line utilities
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,
@@ -39,12 +36,9 @@ Description: OFFIS DICOM toolkit command line utilities
 Package: libdcmtk16
 Architecture: any
 Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: libdcmtk4,
-           libdcmtk3
-Replaces: libdcmtk4,
-          libdcmtk3
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libdcmtk3, libdcmtk4
+Replaces: libdcmtk3, libdcmtk4
 Description: OFFIS DICOM toolkit runtime libraries
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,
@@ -59,20 +53,18 @@ Description: OFFIS DICOM toolkit runtime libraries
 Package: libdcmtk-dev
 Architecture: any
 Section: libdevel
-Depends: libxml2-dev,
-         libssl-dev,
+Depends: libdcmtk16 (= ${binary:Version}),
          libpng-dev,
-         libwrap0-dev,
+         libssl-dev,
          libtiff-dev,
-         libdcmtk16 (= ${binary:Version}),
+         libwrap0-dev,
+         libxml2-dev,
          ${misc:Depends}
 Suggests: dcmtk-doc
 Breaks: libinsighttoolkit4-dev (<< 4.9.0)
-Conflicts: libdcmtk2-dev,
-           libdcmtk4-dev
+Conflicts: libdcmtk2-dev, libdcmtk4-dev
 Provides: libdcmtk2-dev
-Replaces: libdcmtk2-dev,
-          libdcmtk4-dev
+Replaces: libdcmtk2-dev, libdcmtk4-dev
 Description: OFFIS DICOM toolkit development libraries and headers
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,
@@ -89,8 +81,7 @@ Package: dcmtk-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: dcmtk,
-          libdcmtk-dev
+Suggests: dcmtk, libdcmtk-dev
 Description: OFFIS DICOM toolkit documentation
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,

diff --git a/debian/copyright b/debian/copyright
index 963d96d223ab536974a6bf20078c1331875f9e3f..afb525f2e31149ba3b534779bfab86fb53accf78 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -335,7 +335,7 @@ License: GPL-2.0+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this library; see the file COPYING,  if not, see 
+ along with this library; see the file COPYING,  if not, see
  <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public License
@@ -481,8 +481,8 @@ License: Apache-2.0
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- . 
- On Debian GNU/Linux systems you can find this license under 
+ .
+ On Debian GNU/Linux systems you can find this license under
  /usr/share/common-licenses/Apache-2.0
 
 License: BSD-3-clause

diff --git a/debian/dcmtk.install b/debian/dcmtk.install
index 9d3468873f4d33120d260a7b1616af139356dd0d..9c2b398c5204d7a871667945ba61fd86dceeda9d 100644 (file)
--- a/debian/dcmtk.install
+++ b/debian/dcmtk.install
@@ -1,7 +1,7 @@
-usr/bin/*
 etc/dcmtk/*
+usr/bin/*
 usr/share/dcmtk/*.css
 usr/share/dcmtk/*.lut
-usr/share/dcmtk/dsr2xml.xsd
 usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dsr2xml.xsd
 usr/share/dcmtk/dumppat.txt

diff --git a/debian/libdcmtk-dev.install b/debian/libdcmtk-dev.install
index c1c1eecffb51e7a703b21aceb36794ea34d0de21..74cb48049cb485fad70781220df8c4f2fbfbd69a 100644 (file)
--- a/debian/libdcmtk-dev.install
+++ b/debian/libdcmtk-dev.install
@@ -1,4 +1,3 @@
 usr/include/dcmtk/*
 usr/lib/*/*.so
 usr/lib/*/cmake/
-