Trying to out-clever ourselves by having autotools generate the deb-control file...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@674 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f4f774ebba6ad8af20e2df66ef1298a1c0f67c85..e7b099eb11172bfc564fe3ba2fdbde6be7773dae 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -18,6 +18,9 @@ based on whether libjpeg v7 or v8 emulation was enabled.
 fail to compile if the Windows system headers were included before jpeglib.h.
 This issue was caused by a conflict in the definition of the INT32 type.
 
+[4] Fixed 32-bit supplementary package for amd64 Debian systems which was
+broken by enhancements to the packaging system in 1.1.
+
 
 1.1.1
 =====

diff --git a/configure.ac b/configure.ac
index 2bf1f9aac80f0f4913b81165040201b219809cb9..b4d037e7ccf6388ade33df72e98ee06468268f56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -255,7 +255,6 @@ AC_CONFIG_HEADERS([jconfig.h])
 AC_CONFIG_FILES([pkgscripts/libjpeg-turbo.spec:release/libjpeg-turbo.spec.in])
 AC_CONFIG_FILES([pkgscripts/makecygwinpkg:release/makecygwinpkg.in])
 AC_CONFIG_FILES([pkgscripts/makedpkg:release/makedpkg.in])
-AC_CONFIG_FILES([pkgscripts/deb-control:release/deb-control.in])
 AC_CONFIG_FILES([pkgscripts/makemacpkg:release/makemacpkg.in])
 AC_CONFIG_FILES([pkgscripts/Description.plist:release/Description.plist.in])
 AC_CONFIG_FILES([pkgscripts/Info.plist:release/Info.plist.in])

diff --git a/release/deb-control.in b/release/deb-control.tmpl
similarity index 95%
rename from release/deb-control.in
rename to release/deb-control.tmpl
index 1a2386d92bdaaed971e86973ee775ce59605a04b..5a7377ecb8293f30297355b18ad651a8cb57fd1e 100644 (file)
--- a/release/deb-control.in
+++ b/release/deb-control.tmpl
@@ -1,8 +1,8 @@
-Package: @PACKAGE_NAME@
-Version: @VERSION@-@BUILD@
+Package: {__PKGNAME}
+Version: {__VERSION}-{__BUILD}
 Section: misc
 Priority: optional
-Architecture: @DEBARCH@
+Architecture: {__ARCH}
 Essential: no
 Maintainer: The libjpeg-turbo Project [http://www.libjpeg-turbo.org]
 Description: A SIMD-accelerated JPEG codec which provides both the libjpeg and TurboJPEG APIs

diff --git a/release/makedpkg.in b/release/makedpkg.in
index 2a0539ac6b0691bf1c0a40e9aa57ac73be6edf2e..aaaeacbcf08f19f0f4cb6456bd6c06c45961a250 100644 (file)
--- a/release/makedpkg.in
+++ b/release/makedpkg.in
@@ -32,7 +32,9 @@ makedeb()
        rm -f $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb
        TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
        mkdir $TMPDIR/DEBIAN
-       cp pkgscripts/deb-control $TMPDIR/DEBIAN/control
+       (cat $SRCDIR/release/deb-control.tmpl | sed s/{__PKGNAME}/$PACKAGE_NAME/g \
+               | sed s/{__VERSION}/$VERSION/g | sed s/{__BUILD}/$BUILD/g \
+               | sed s/{__ARCH}/$DEBARCH/g > $TMPDIR/DEBIAN/control)
 
        make install prefix=$TMPDIR/opt/$DIRNAME libdir=$TMPDIR/opt/$DIRNAME/$__LIB mandir=$TMPDIR/opt/$DIRNAME/man
        rm -f $TMPDIR/opt/$DIRNAME/$__LIB/*.la