Author: malat
Date: 2012-04-11 14:36:31 +0000 (Wed, 11 Apr 2012)
New Revision: 10375
Modified:
trunk/packages/charls/trunk/debian/changelog
trunk/packages/charls/trunk/debian/compat
trunk/packages/charls/trunk/debian/control
trunk/packages/charls/trunk/debian/copyright
trunk/packages/charls/trunk/debian/libcharls-dev.install
trunk/packages/charls/trunk/debian/libcharls1.install
trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
trunk/packages/charls/trunk/debian/rules
Log:
tweak charls for multiarch
Modified: trunk/packages/charls/trunk/debian/changelog
===================================================================
--- trunk/packages/charls/trunk/debian/changelog 2012-04-11 14:10:36 UTC
(rev 10374)
+++ trunk/packages/charls/trunk/debian/changelog 2012-04-11 14:36:31 UTC
(rev 10375)
@@ -1,12 +1,21 @@
-charls (1.0-2) UNRELEASED; urgency=low
+charls (1.0-2) unstable; urgency=low
[ Thorsten Alteholz ]
* debian/rules: download URL for get-orig-source changed
* debian/rules get-orig-source: put orig.tar.gz in ../tarballs to allow
automatic build with svn-buildpackage
- -- Mathieu Malaterre <[email protected]> Fri, 28 Oct 2011 18:00:00
+0200
+ [ Mathieu Malaterre ]
+ * Use my @d.o alias
+ * Remove DMUA flag
+ * use dh(9), get hardening for free
+ * make package multiarch
+ * Bump Std-Vers to 3.9.3, no changes needed
+ * Update d/copyright to latest dep5
+ * Use dep3 for patches
+ -- Mathieu Malaterre <[email protected]> Wed, 11 Apr 2012 16:21:40 +0200
+
charls (1.0-1) unstable; urgency=low
* Initial release (Closes: #624346)
Modified: trunk/packages/charls/trunk/debian/compat
===================================================================
--- trunk/packages/charls/trunk/debian/compat 2012-04-11 14:10:36 UTC (rev
10374)
+++ trunk/packages/charls/trunk/debian/compat 2012-04-11 14:36:31 UTC (rev
10375)
@@ -1 +1 @@
-7
+9
Modified: trunk/packages/charls/trunk/debian/control
===================================================================
--- trunk/packages/charls/trunk/debian/control 2012-04-11 14:10:36 UTC (rev
10374)
+++ trunk/packages/charls/trunk/debian/control 2012-04-11 14:36:31 UTC (rev
10375)
@@ -2,18 +2,17 @@
Section: libs
Priority: optional
Maintainer: Debian Med Packaging Team
<[email protected]>
-DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), cmake, quilt (>= 0.46-7~)
-Standards-Version: 3.9.1
+Uploaders: Mathieu Malaterre <[email protected]>
+Build-Depends: debhelper (>= 9), cmake
+Standards-Version: 3.9.3
Homepage: http://charls.codeplex.com
-Vcs-Browser:
http://svn.debian.org/wsvn/debian-med/trunk/packages/charls/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/charls/trunk/
+Vcs-Browser:
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/charls/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/charls/trunk/
Package: libcharls-dev
Section: libdevel
Architecture: any
-Depends: libcharls1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libcharls1 (= ${binary:Version}), ${misc:Depends}
Description: Implementation of the JPEG-LS standard
CharLS is an optimized implementation of the JPEG-LS standard for lossless and
near-lossless image compression
@@ -27,6 +26,7 @@
Package: libcharls1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Description: Implementation of the JPEG-LS standard
CharLS is an optimized implementation of the JPEG-LS standard for lossless and
near-lossless image compression
Modified: trunk/packages/charls/trunk/debian/copyright
===================================================================
--- trunk/packages/charls/trunk/debian/copyright 2012-04-11 14:10:36 UTC
(rev 10374)
+++ trunk/packages/charls/trunk/debian/copyright 2012-04-11 14:36:31 UTC
(rev 10375)
@@ -1,25 +1,25 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: CharLS
-Maintainer: Mathieu Malaterre
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: CharLS
+Upstream-Contact: Jan de Vaan <[email protected]>
Source: http://charls.codeplex.com
Files: *
Copyright: © Jan de Vaan 2007-2010, all rights reserved.
-License: BSD
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+ .
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
-
+ .
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+ .
* Neither the name of my employer, nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE
@@ -32,5 +32,6 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: debian/*
-Copyright: 2011; Mathieu Malaterre <[email protected]>
-License: BSD
+Copyright: © 2011-2012 Mathieu Malaterre <[email protected]>
+License: BSD-3-clause
+ Same as above
Modified: trunk/packages/charls/trunk/debian/libcharls-dev.install
===================================================================
--- trunk/packages/charls/trunk/debian/libcharls-dev.install 2012-04-11
14:10:36 UTC (rev 10374)
+++ trunk/packages/charls/trunk/debian/libcharls-dev.install 2012-04-11
14:36:31 UTC (rev 10375)
@@ -1,2 +1,2 @@
usr/include/CharLS/*.h
-usr/lib/libCharLS.so
+usr/lib/*/libCharLS.so
Modified: trunk/packages/charls/trunk/debian/libcharls1.install
===================================================================
--- trunk/packages/charls/trunk/debian/libcharls1.install 2012-04-11
14:10:36 UTC (rev 10374)
+++ trunk/packages/charls/trunk/debian/libcharls1.install 2012-04-11
14:36:31 UTC (rev 10375)
@@ -1,2 +1,2 @@
-usr/lib/libCharLS.so.1.0
-usr/lib/libCharLS.so.1
+usr/lib/*/libCharLS.so.1.0
+usr/lib/*/libCharLS.so.1
Modified:
trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
===================================================================
---
trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
2012-04-11 14:10:36 UTC (rev 10374)
+++
trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
2012-04-11 14:36:31 UTC (rev 10375)
@@ -1,3 +1,7 @@
+Description: Fix broken installation rules
+Forwarded: not-needed
+Author: Mathieu Malaterre <[email protected]>
+
Index: charls-1.0/CMakeLists.txt
===================================================================
--- charls-1.0.orig/CMakeLists.txt 2011-04-27 21:06:40.000000000 +0200
Modified:
trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
===================================================================
---
trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
2012-04-11 14:10:36 UTC (rev 10374)
+++
trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
2012-04-11 14:36:31 UTC (rev 10375)
@@ -1,3 +1,7 @@
+Description: Fix broken SOVERSION rules
+Forwarded: not-needed
+Author: Mathieu Malaterre <[email protected]>
+
Index: charls-1.0/CMakeLists.txt
===================================================================
--- charls-1.0.orig/CMakeLists.txt 2011-04-27 21:06:42.000000000 +0200
Modified: trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
2012-04-11 14:10:36 UTC (rev 10374)
+++ trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
2012-04-11 14:36:31 UTC (rev 10375)
@@ -1,3 +1,7 @@
+Description: Fix broken test
+Forwarded: not-needed
+Author: Mathieu Malaterre <[email protected]>
+
Index: charls-1.0/defaulttraits.h
===================================================================
--- charls-1.0.orig/defaulttraits.h 2011-04-27 21:06:39.000000000 +0200
Modified: trunk/packages/charls/trunk/debian/rules
===================================================================
--- trunk/packages/charls/trunk/debian/rules 2012-04-11 14:10:36 UTC (rev
10374)
+++ trunk/packages/charls/trunk/debian/rules 2012-04-11 14:36:31 UTC (rev
10375)
@@ -1,19 +1,17 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules for charls
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ -Dcharls_BUILD_SHARED_LIBS:BOOL=ON \
+ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
%:
- dh --parallel --with quilt --buildsystem=cmake $@
+ dh $@ --parallel --buildsystem=cmake
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release
-Dcharls_BUILD_SHARED_LIBS:BOOL=ON
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
VER_MAJOR = 1
VER_MINOR = 0
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
