[bollin] r5073 committed - * Added alternatives to handle fp (IDE) binary. (Closes: Bug#655626)...
bol...@googlecode.com
Author: abou.al...@sfr.fr
Date: Thu Mar 1 06:52:10 2012
Log: * Added alternatives to handle fp (IDE) binary. (Closes:
Bug#655626)
* Use grep instead of egrep in debian/rules
* Use single quote for sed RE in order to avoid issues with some shells.
* Set priority according to version in fpc and fp-utils so that newer
version is automatically selected.
http://code.google.com/p/bollin/source/detail?r=5073
Modified:
/fpc/trunk/debian/changelog
/fpc/trunk/debian/fixdeb
/fpc/trunk/debian/rules
=======================================
--- /fpc/trunk/debian/changelog Thu Jan 26 10:14:18 2012
+++ /fpc/trunk/debian/changelog Thu Mar 1 06:52:10 2012
@@ -1,8 +1,11 @@
fpc (2.6.0-2) unstable; urgency=low
* Added alternatives to handle fp (IDE) binary. (Closes: Bug#655626)
-
- -- Abou Al Montacir <abou.al...@sfr.fr> Thu, 26 Jan 2012 13:27:00
+0100
+ * Set priority according to version in fpc and fp-utils so that newer
version
+ is automatically selected.
+
+
+ -- Abou Al Montacir <abou.al...@sfr.fr> Thu, 01 Mar 2012 15:49:00
+0100
fpc (2.6.0-1) unstable; urgency=low
=======================================
--- /fpc/trunk/debian/fixdeb Mon May 9 23:48:08 2011
+++ /fpc/trunk/debian/fixdeb Thu Mar 1 06:52:10 2012
@@ -5,11 +5,11 @@
#set -x
if [ $# -lt 3 ]; then
- echo 'Usage : fixdeb <path> <target> <ppcbin> [package priority]'
- echo ' $1 = path to debian files'
- echo ' $2 = fpc target (i386-linux)'
- echo ' $3 = ppcXXX binary name (ppc386)'
- echo ' $4 = package priority in alternative system'
+ echo 'Usage : fixdeb <path> <target> <ppcbin> [priority]'
+ echo ' <path> = path to debian files'
+ echo ' <target> = fpc target (i386-linux)'
+ echo ' <ppcbin> = ppcXXX binary name (ppc386)'
+ echo ' [priority] = package priority in alternative system'
exit 1
fi
@@ -20,7 +20,7 @@
DEB_SUBST_TARGET="$2"
DEB_SUBST_PPCBIN="$3"
DEB_SUBST_PACKAGESUFFIX=${PACKAGESUFFIX}
-DEB_SUBST_PRIORITY=${4:-$(echo ${DEB_SUBST_VERSION} | sed -e 's/\.//g')}
+DEB_SUBST_PRIORITY=${4:-$(($(echo ${DEB_SUBST_VERSION}.0.0.0.0 | sed
-e 's@\([0-9]\)\+\.\([0-9]\)\+\.\([0-9]\+\)\.\([0-9]\+\).*@((\1*100+\2)*100+\3)*100+\4@')))}
SUBST_CMD=`set | sed -n -e 's/^DEB_SUBST_\([A-Z_]\+\)=\(.*\)/-e
s@\${\1}@\2@g/p'`
=======================================
--- /fpc/trunk/debian/rules Tue Dec 27 08:08:23 2011
+++ /fpc/trunk/debian/rules Thu Mar 1 06:52:10 2012
@@ -58,7 +58,7 @@
FPCTARGET=$(CPU_TARGET)-linux
# Get version information from changelog file
-DEB_VERSION:=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2
-d ' ')
+DEB_VERSION:=$(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2
-d ' ')
DEB_UPSTREAM_VERSION:=$(shell echo $(DEB_VERSION) | cut -f 1 -d -)
DEB_UPSTREAM_MAIN_VERSION:=$(shell echo ${DEB_UPSTREAM_VERSION} | sed
-e 's/^\([0-9\.]*\).*/\1/')
DEB_BUILD=$(lastword $(subst -, ,${DEB_VERSION}))