further cleanups from feedback by Steve Langasek

11 files changed, 23 insertions, 53 deletions

diff --git a/debian/control b/debian/control
index 26fa9dc..7320c7a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,13 @@
 Source: libjpeg-turbo
 Priority: extra
-Maintainer: Alexander Bokovoy <ab@samba.org>
+Maintainer: Linaro Developers <linaro-dev@linaro.org>
 Uploaders: Tom Gall <tom.gall@linaro.org>
-Build-Depends: debhelper (>= 7.0.50~), automake, libtool, autoconf, dh-autoreconf, nasm [i386]
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, nasm [amd64 i386]
 Standards-Version: 3.9.1
 Section: libs
-Vcs-Git: git://gitorious.org/meego-image-editor/libjpeg-turbo.git
+Vcs-Git: git://git.linaro.org/people/tomgall/meego/libjpeg-turbo.git linaroize
 
-Package: libturbojpeg6-dev
-Section: libdevel
-Architecture: any
-Depends: libturbojpeg6 (= ${binary:Version}),  ${misc:Depends}, libc-dev
-Description: Development files for the IJG JPEG library
- The Independent JPEG Group's JPEG library is a library for handling
- JPEG files.
- This variation is from the meego project.
- .
- This package contains the static library, headers and documentation.
-Conflicts: libjpeg62-dev, libjpeg8-dev
-Replaces: libjpeg62-dev, libjpeg8-dev
-
-Package: libturbojpeg6
+Package: libturbojpeg62
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libc
@@ -31,8 +18,8 @@ Description: The Independent JPEG Group's JPEG runtime library
  optimizations.
  .
  This package contains the shared library.
-Conflicts: libjpeg62, libjepg8
-Replaces: libjpeg62, libjpeg8
+Conflicts: libjpeg62
+Replaces: libjpeg62
 
 Package: libturbojpeg-progs
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index f12a599..8857182 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,17 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&
 Name: libjpeg-turbo
 Source: git://gitorious.org/meego-image-editor/libjpeg-turbo
 
-Files: All with the exception of (debian/*, bmp.c, bmp.h, jchuff.ci, jdhuff.*, jpegut.c, jpgtest.cxx, rrtimer.h, rrutil.h, turbojpeg.h, turbojpegl.c)
-Copyright:
-1999-2006 MIYASAKA Masaru, 2004 Landmark Graphics Corporation, 2005-2007 Sun Microsystems, Inc., 2009 Pierre Ossman for Cendio AB,2009-2010 D. R. Commander, 2010, Thomas G. Lane, Guido Vollbeding, 2009, Thomas G. Lane, Guido Vollbeding, 1998, Thomas G. Lane, 2010 Nokia Corporation
-License: 
+Files: *
+Copyright: 1999-2006 MIYASAKA Masaru 
+    2004 Landmark Graphics Corporation
+    2005-2007 Sun Microsystems, Inc.
+    2009 Pierre Ossman for Cendio AB
+    2009-2010 D. R. Commander
+    2010 Thomas G. Lane, Guido Vollbeding
+    2009, Thomas G. Lane, Guido Vollbeding
+    1998, Thomas G. Lane
+    2010 Nokia Corporation
+License:  JPEG
  In plain English:
  .
  1. We don't promise that this software works.  (But if you find any bugs,
@@ -55,7 +62,7 @@ License:
 
 Files: bmp.c, bmp.h, jchuff.ci, jdhuff.*, jpegut.c, jpgtest.cxx, rrtimer.h, rrutil.h, turbojpeg.h, turbojpegl.c
 Copyright: 1998-2005 Julian Smart, Robert Roebling et al
-License: wxWindows Library License
+License: wxWindows
  .
                 wxWindows Library Licence, Version 3.1
                 ======================================
@@ -113,8 +120,6 @@ License: wxWindows Library License
 Files: debian/*
 Copyright: 2010 Linaro Limited
 License: LGPL-2.1
-
-License: LGPL-2.1
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
  License (LGPL) as published by the Free Software Foundation;
diff --git a/debian/docs b/debian/docs
index 4fddfb0..cea5a21 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,16 +1,4 @@
-BUILDING.txt
-change.log
-ChangeLog.txt
-CMakeLists.txt
-coderules.txt
-filelist.txt
-install.txt
-jconfig.txt
-LGPL.txt
 libjpeg.txt
-LICENSE.txt
 README
 README-turbo.txt
 structure.txt
-usage.txt
-wizard.txt
diff --git a/debian/libturbojpeg-dev.dirs b/debian/libturbojpeg-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/libturbojpeg-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/libturbojpeg-dev.install b/debian/libturbojpeg-dev.install
deleted file mode 100644
index f882277..0000000
--- a/debian/libturbojpeg-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
diff --git a/debian/libturbojpeg6.dirs b/debian/libturbojpeg6.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libturbojpeg6.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libturbojpeg6.install b/debian/libturbojpeg62.install
index 408d497..2cb3a55 100644
--- a/debian/libturbojpeg6.install
+++ b/debian/libturbojpeg62.install
@@ -1,2 +1,2 @@
-usr/lib/libjpeg*.so.*
+usr/lib/libjpeg.so.62*
 usr/lib/libturbojpeg.so
diff --git a/debian/libturbojpeg62.lintianoverrides b/debian/libturbojpeg62.lintianoverrides
new file mode 100644
index 0000000..d8349f2
--- /dev/null
+++ b/debian/libturbojpeg62.lintianoverrides
@@ -0,0 +1,2 @@
+# yes, we specifically want linkers to depends on the standard libjpeg name
+libturbojpeg62: shlibs-declares-dependency-on-other-package libjpeg62 (>=6b1)
diff --git a/debian/shlibs b/debian/libturbojpeg62.shlibs
index 113927b..113927b 100644
--- a/debian/shlibs
+++ b/debian/libturbojpeg62.shlibs
diff --git a/debian/rules b/debian/rules
index afe34ff..8092c21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,8 @@
 %:
 	dh $@  --with autoreconf
 
-#override_dh_auto_configure:
-#	aclocal
-#	automake --add-missing
-#	autoconf
-#	./configure --prefix=/usr
-
+override_dh_installchangelogs:
+	dh_installchangelogs change.log
 
 DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
 DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index 113927b..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1 +0,0 @@
-libjpeg         62      libjpeg62 (>=6b1)