[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#705309: marked as done (unblock: fpc/2.6.0-8)



Your message dated Fri, 12 Apr 2013 22:19:59 +0200
with message-id <51686C6F.6030309@debian.org>
and subject line Re: Bug#705309: unblock: fpc/2.6.0-8
has caused the Debian Bug report #705309,
regarding unblock: fpc/2.6.0-8
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
705309: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705309
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock package fpc

Version 2.6.0-8 fixes bug 704252 where it was reported that the package
change the debian/control file during the build process.

The proposed fix was approved by Jonathan on IRC on Wednesday.

Please find attached the debdiff between 2.6.0-7 and 2.6.0-8.

unblock fpc/2.6.0-8

- -- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAEBCAAGBQJRaGhhAAoJEJxcmesFvXUKUa0IAMizD+OZ/srL9jzO53Yx7ohE
o7oYbjkhS0ycMVjdv/tdmgis4X9hz/TCdPdgEJH6YCgCnlHz3IGTqVmQD/16BuHB
zWIVSqG35aqUuIFSXVbjnhI9uVkB5r99+fQyUW98Io2HDrPfVkwY5jso/LLm1xed
doPkcT9UMOrPLjHYmCPt6QdNW5O4cXT5nrKUty2tQczj02+fJqVBMZlzBaIaI6qb
eQA89SNYAPDY3JPcV4RzpbwJ1dI2cMcH7inzsVch5DR2Yccw1FIJN6yp/LW+DgbK
n4RIOovZVQztULSZIfT+3ek8V98qvdlSCTR7tQNaHZfcUC7mxdMgCNbYOTCWy5E=
=E6HG
-----END PGP SIGNATURE-----
diff -Nru fpc-2.6.0/debian/changelog fpc-2.6.0/debian/changelog
--- fpc-2.6.0/debian/changelog	2012-12-22 10:12:58.000000000 +0100
+++ fpc-2.6.0/debian/changelog	2013-04-12 20:56:16.000000000 +0200
@@ -1,3 +1,10 @@
+fpc (2.6.0-8) unstable; urgency=low
+
+  * Removed auto-generation of debian/control during build process as required
+    by policy. (Closes: Bug#704252)
+
+ -- Abou Al Montacir <abou.almontacir@sfr.fr>  Tue, 26 Mar 2013 09:54:00 +0100
+
 fpc (2.6.0-7) unstable; urgency=low
 
   * Proofread templates by debian-l10n-english list. (Closes: Bug#686038)
diff -Nru fpc-2.6.0/debian/fixdeb fpc-2.6.0/debian/fixdeb
--- fpc-2.6.0/debian/fixdeb	2012-11-28 08:00:37.000000000 +0100
+++ fpc-2.6.0/debian/fixdeb	2013-04-12 19:38:14.000000000 +0200
@@ -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 -e
+
+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_GNU_CPU)-$(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 -Nru fpc-2.6.0/debian/rules fpc-2.6.0/debian/rules
--- fpc-2.6.0/debian/rules	2012-11-28 07:31:42.000000000 +0100
+++ fpc-2.6.0/debian/rules	2013-04-12 19:36:16.000000000 +0200
@@ -167,9 +167,11 @@
 #
 
 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 @@
 
 get-orig-source:
 	-uscan --upstream-version=0 --rename
+
+debian/control:debian/fixdeb
+	$< --gen-control *.in

--- End Message ---
--- Begin Message ---
Please ignore this request as the package fails to build on i386. I do
understand the problem and will come back to you.

Paul

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---

Reply to: