diff -Nru apt-build-0.12.43/debian/changelog apt-build-0.12.44/debian/changelog --- apt-build-0.12.43/debian/changelog 2012-04-11 21:14:35.000000000 +0000 +++ apt-build-0.12.44/debian/changelog 2012-11-27 17:43:26.000000000 +0000 @@ -1,3 +1,13 @@ +apt-build (0.12.44) unstable; urgency=low + + * QA upload. + * Don't fail on postinstallation if no "processor" found in /proc/cpuinfo. + LP: #1065678 (Thanks to Dawid Wróbel.) Closes: #694554 + * Generate APT paths properly with apt-config shell .../f .../d . + Closes: #694557 + + -- Dominique Lasserre Tue, 27 Nov 2012 18:43:18 +0100 + apt-build (0.12.43) unstable; urgency=low * QA upload. diff -Nru apt-build-0.12.43/debian/config apt-build-0.12.44/debian/config --- apt-build-0.12.43/debian/config 2012-04-11 21:11:12.000000000 +0000 +++ apt-build-0.12.44/debian/config 2012-10-15 21:46:03.000000000 +0000 @@ -76,9 +76,8 @@ db_subst apt-build/add_to_sourceslist repo "$RET" -eval $(apt-config shell etcdir Dir::Etc) -eval $(apt-config shell sourceslist Dir::Etc::sourcelist) -eval $(apt-config shell sourcesparts Dir::Etc::sourceparts) +eval $(apt-config shell sourceslist Dir::Etc::sourcelist/f) +eval $(apt-config shell sourcesparts Dir::Etc::sourceparts/d) if [ ! -e $CONFFILE ] ; then # set to true for initial configuration (conffile does not exist) @@ -87,7 +86,7 @@ db_set apt-build/add_to_sourceslist "false" # run loop to prevent errors if some sources does not exist - for source in /"$etcdir""$sourceslist" /"$etcdir""$sourcesparts"/*.list ; do + for source in "$sourceslist" "$sourcesparts"*.list ; do if [ -e "$source" ] ; then if grep -Eq "^[[:space:]]*deb file:$repository_dir apt-build main" "$source" ; then db_set apt-build/add_to_sourceslist "true" @@ -109,7 +108,7 @@ multithreaded="$make_options" elif [ -r /proc/cpuinfo ] && [ ! -e $CONFFILE ] ; then # get number of cores and set as default job argument - multithreaded="-j$(grep -c processor /proc/cpuinfo)" + multithreaded="-j$(grep -c processor /proc/cpuinfo)" || true # only allow whole numbers case "${multithreaded#-j}" in ''|*[!0-9]*|0*) diff -Nru apt-build-0.12.43/debian/postinst apt-build-0.12.44/debian/postinst --- apt-build-0.12.43/debian/postinst 2012-04-11 21:11:12.000000000 +0000 +++ apt-build-0.12.44/debian/postinst 2012-10-15 21:46:46.000000000 +0000 @@ -64,17 +64,14 @@ # prepare sources.list entry - eval $(apt-config shell etcdir Dir::Etc) - eval $(apt-config shell sourceslist Dir::Etc::sourcelist) - eval $(apt-config shell sourcesparts Dir::Etc::sourceparts) - sourceslist=/"$etcdir""$sourceslist" - sourcesparts=/"$etcdir""$sourcesparts" - aptbuildsource="$sourcesparts"/apt-build.list + eval $(apt-config shell sourceslist Dir::Etc::sourcelist/f) + eval $(apt-config shell sourcesparts Dir::Etc::sourceparts/d) + aptbuildsource="$sourcesparts"apt-build.list debline="deb file:$repository_dir apt-build main" src_enabled="false" # run loop to prevent errors if some sources does not exist - for source in "$sourceslist" "$sourcesparts"/*.list ; do + for source in "$sourceslist" "$sourcesparts"*.list ; do if [ -e "$source" ] ; then # comment in all sources lists if asked if [ "$add_to_sourceslist" = "false" ] ; then