On Wed, 2013-04-10 at 21:30 +0200, Paul Gevers wrote: > > Maybe we can leave with this for wheezy, but should be > > fixed anyway. So please keep open to be fixed for next uploads. > > I just had a conversation on IRC with the RT, and they like to fix this > in Wheezy if the patch can be small. Abou, I expect something similar to > Lazarus [1]? I will look into creating a patch, but you know the package > a lot better than me, so don't hesitate to come up with something. > > Paul > > [1] https://code.google.com/p/bollin/source/detail?r=5210#
Hi Paul, I've already committed this on svn on branch 2.6.0. I'm attaching patches for info. If you agree I can upload to mentors. I don't think bug#704251 is mandatory, but if you want I also have its fix, just did not commit as I'm not sure I'll push it for wheezy. Cheers,
From 7890fd40c36b6288c20168737e220a7e4cdaf22a Mon Sep 17 00:00:00 2001 From: "abou.almonta...@sfr.fr" <abou.almonta...@sfr.fr@b4165226-8c1b-0410-80e1-07324e54c907> Date: Tue, 9 Apr 2013 17:27:21 +0000 Subject: [PATCH 1/3] Fixed typo in French translation. (Closes: Bug#696536) git-svn-id: https://bollin.googlecode.com/svn/fpc/branches/2.6.0@5215 b4165226-8c1b-0410-80e1-07324e54c907 --- debian/changelog | 6 ++++++ debian/po/fr.po | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e97fcb7..9e6a61c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fpc (2.6.0-8) unstable; urgency=low + + * Fixed typo in French translation. (Closes: Bug#696536) + + -- Abou Al Montacir <abou.almonta...@sfr.fr> Thu, 27 Dec 2012 08:54:00 +0100 + fpc (2.6.0-7) unstable; urgency=low * Proofread templates by debian-l10n-english list. (Closes: Bug#686038) diff --git a/debian/po/fr.po b/debian/po/fr.po index 69bd61a..b05196b 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fpc\n" "Report-Msgid-Bugs-To: f...@packages.debian.org\n" -"POT-Creation-Date: 2012-09-03 21:31-0400\n" +"POT-Creation-Date: 2012-09-25 19:56+0200\n" "PO-Revision-Date: 2012-09-03 21:41-0400\n" "Last-Translator: David Prévot <da...@tilapin.org>\n" "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: boolean #. Description -#: ../fp-compiler.templates.in:1001 +#: ../fp-compiler.templates.in:2001 msgid "Rename \"/etc/fpc.cfg\" to \"/etc/fpc.cfg.bak\"?" -msgstr "Faut-il renommer « /etc/fpc.cfg » en « /etc/fpc.cfg.bak » ?" +msgstr "Faut-il renommer « /etc/fpc.cfg » en « /etc/fpc.cfg.bak » ?" #. Type: boolean #. Description -#: ../fp-compiler.templates.in:1001 +#: ../fp-compiler.templates.in:2001 msgid "" "FPC now supports having multiple versions installed on the same system. The " "update-alternatives command can be used to set a default version for\n" @@ -43,7 +43,7 @@ msgstr "" #. Type: boolean #. Description -#: ../fp-compiler.templates.in:1001 +#: ../fp-compiler.templates.in:2001 msgid "" "Whatever version you may choose as default, the configuration files are " "always backward compatible, so it should always be safe to use the latest " @@ -55,7 +55,7 @@ msgstr "" #. Type: boolean #. Description -#: ../fp-compiler.templates.in:1001 +#: ../fp-compiler.templates.in:2001 msgid "" "In order to use the alternatives system on the system wide FPC configuration " "file you must accept renaming \"/etc/fpc.cfg\"; otherwise you will need to " -- 1.7.10.4
From cf9ef0b076939ff6ad214d0bdb7a3ba4ec7c319a Mon Sep 17 00:00:00 2001 From: "abou.almonta...@sfr.fr" <abou.almonta...@sfr.fr@b4165226-8c1b-0410-80e1-07324e54c907> Date: Tue, 9 Apr 2013 17:32:11 +0000 Subject: [PATCH 2/3] Don't remove fpc.*dpkg* the release team don't like it and as far as I can tell it isn't needed. Update changelog git-svn-id: https://bollin.googlecode.com/svn/fpc/branches/2.6.0@5216 b4165226-8c1b-0410-80e1-07324e54c907 --- debian/changelog | 7 ++++++- debian/fp-compiler.postrm.in | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e6a61c..3f4561d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ fpc (2.6.0-8) unstable; urgency=low + [ Abou Al Montacir ] * Fixed typo in French translation. (Closes: Bug#696536) - -- Abou Al Montacir <abou.almonta...@sfr.fr> Thu, 27 Dec 2012 08:54:00 +0100 + [ Peter Michael Green ] + * Don't remove fpc.*dpkg* the release team don't like it and + as far as I can tell it isn't needed. + + -- Abou Al Montacir <abou.almonta...@sfr.fr> Tue, 26 Mar 2013 09:54:00 +0100 fpc (2.6.0-7) unstable; urgency=low diff --git a/debian/fp-compiler.postrm.in b/debian/fp-compiler.postrm.in index 2b89b54..5199a59 100644 --- a/debian/fp-compiler.postrm.in +++ b/debian/fp-compiler.postrm.in @@ -13,5 +13,4 @@ if test "${ACTION}" = "purge" then rm -f "${CFG_FILE}".cfg rm -f "${CFG_FILE}".bak - rm -f "${CFG_FILE}".*dpkg* fi -- 1.7.10.4
From 89c39be01ec2213eb434290bfaf1580f0dbe3bd6 Mon Sep 17 00:00:00 2001 From: "abou.almonta...@sfr.fr" <abou.almonta...@sfr.fr@b4165226-8c1b-0410-80e1-07324e54c907> Date: Tue, 9 Apr 2013 17:32:26 +0000 Subject: [PATCH 3/3] Removed auto-generation of debian/control during build process as required by policy. (Closes: Bug#704252) git-svn-id: https://bollin.googlecode.com/svn/fpc/branches/2.6.0@5217 b4165226-8c1b-0410-80e1-07324e54c907 --- debian/changelog | 2 ++ debian/fixdeb | 66 +++++++++++++++++++++++++++++++++++++----------------- debian/rules | 9 ++++++-- 3 files changed, 54 insertions(+), 23 deletions(-) mode change 100644 => 100755 debian/fixdeb diff --git a/debian/changelog b/debian/changelog index 3f4561d..0c537d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ fpc (2.6.0-8) unstable; urgency=low [ Abou Al Montacir ] * Fixed typo in French translation. (Closes: Bug#696536) + * Removed auto-generation of debian/control during build process as required + by policy. (Closes: Bug#704252) [ Peter Michael Green ] * Don't remove fpc.*dpkg* the release team don't like it and diff --git a/debian/fixdeb b/debian/fixdeb old mode 100644 new mode 100755 index ff8b17c..5476e05 --- a/debian/fixdeb +++ b/debian/fixdeb @@ -3,29 +3,53 @@ # Create debian files from *.in files # -#set -x -if [ $# -lt 3 ]; then - 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 +set -ex + +usage() +{ + echo 'Usage : DEB_SUBST_<var1>=<val1> ... DEB_SUBST_<var1>=<val1> fixdeb [-sc|--gen-control] <file1.in> [file1.in] ... [filen.in]' + echo ' Changes environment variables with their values. The variables to be' + echo ' changed should be exported prefixed with DEB_SUBST_<name of the variable>' + echo ' --gen-control: do not skip generating control file, by default it will be ignored' + echo ' <files.in> = space separated list to debian files templates' + echo + echo ' List of defined variables' + set | grep '^DEB_SUBST_' + exit 1 +} + +true ${DEB_SUBST_PACKAGEVERSION:=$(dpkg-parsechangelog | sed -ne's,^Version: \(.*\),\1,p')} +true ${DEB_SUBST_VERSION:=$(echo $DEB_SUBST_PACKAGEVERSION | sed -ne's,^\([0-9.]*\).*,\1,p')} +true ${DEB_SUBST_DEBVERSION:=$(echo $DEB_SUBST_PACKAGEVERSION | awk -F '-' '{ print $NF }')} +true ${DEB_SUBST_SVNPATH:=$(echo $DEB_SUBST_VERSION | awk -F '.' '{ print "release_"$1"_"$2"_"$3 }')} +true ${DEB_SUBST_UPSTREAM_VERSION:=$(echo ${DEB_SUBST_PACKAGEVERSION} | cut -f 1 -d -)} +true ${DEB_SUBST_UPSTREAM_MAIN_VERSION:=$(echo ${DEB_SUBST_UPSTREAM_VERSION} | sed -e 's/^\([0-9\.]*\).*/\1/')} +true ${DEB_SUBST_PACKAGESUFFIX:=-${DEB_SUBST_UPSTREAM_MAIN_VERSION}} +true ${DEB_SUBST_PRIORITY:=$(($(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@')))} +true ${DEB_SUBST_TARGET:=$(dpkg-architecture -qDEB_BUILD_ARCH)-$(dpkg-architecture -qDEB_BUILD_ARCH_OS)} -DEB_SUBST_PACKAGEVERSION=`dpkg-parsechangelog | sed -ne's,^Version: \(.*\),\1,p'` -DEB_SUBST_VERSION=`echo $DEB_SUBST_PACKAGEVERSION | sed -ne's,^\([0-9.]*\).*,\1,p'` -DEB_SUBST_DEBVERSION=`echo $DEB_SUBST_PACKAGEVERSION | awk -F '-' '{ print $NF }'` -DEB_SUBST_SVNPATH=`echo $DEB_SUBST_VERSION | awk -F '.' '{ print "release_"$1"_"$2"_"$3 }'` -DEB_SUBST_TARGET="$2" -DEB_SUBST_PPCBIN="$3" -DEB_SUBST_PACKAGESUFFIX=${PACKAGESUFFIX} -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@')))} +if ${1} = '--gen-control' +then + gen_control=true + shift +else + gen_control=false +fi +if test $# -lt 1 +then + usage +fi -SUBST_CMD=`set | sed -n -e 's/^DEB_SUBST_\([A-Z_]\+\)=\(.*\)/-e s@\${\1}@\2@g/p'` +echo 'List of defined variables' +set | grep '^DEB_SUBST_' +SUBST_CMD=$(set | sed -n -e 's/^DEB_SUBST_\([A-Z_]\+\)=\(.*\)/-e s@\${\1}@\2@g/p') -for i in $1/*.in +for i in $* do - j=`basename ${i} .in` - sed ${SUBST_CMD} ${i} > $1/${j/./${PACKAGESUFFIX}.} + f=$(basename ${i} .in) + if ${gen_control} || test ${f} != 'control' + then + d=$(dirname ${i}) + sed ${SUBST_CMD} ${i} > ${d}/${f/./${DEB_SUBST_PACKAGESUFFIX}.} + fi done diff --git a/debian/rules b/debian/rules index 5fbdb2e..293ce4f 100755 --- a/debian/rules +++ b/debian/rules @@ -167,9 +167,11 @@ clean-patched: # debian-files: debian-files-stamp -debian-files-stamp: +debian-files-stamp:debian/fixdeb @echo "--- Creating/fixing *.install files" - /bin/bash debian/fixdeb debian $(FPCTARGET) $(PPNEW) + DEB_SUBST_PACKAGESUFFIX=${PACKAGESUFFIX} \ + DEB_SUBST_PPCBIN=${PPNEW} \ + $< debian/*.in touch debian-files-stamp ################### @@ -381,3 +383,6 @@ binary-arch: arrange-arch get-orig-source: -uscan --upstream-version=0 --rename + +debian/control:debian/fixdeb + $< --gen-control *.in -- 1.7.10.4
signature.asc
Description: This is a digitally signed message part
