Merge lp:~l3on/ubuntu/precise/icecc/fix-ftbfs into lp:ubuntu/precise/icecc

[Leo Iannacone]

Fix ftbfs due to:
 `pkglibdir' is not a legitimate directory for `SCRIPTS'

[Daniel Holbach (dholbach)]

Good work! :-)

review: Approve

=== removed directory '.pc/10_rename_scheduler.diff'
=== removed directory '.pc/10_rename_scheduler.diff/services'
=== removed file '.pc/10_rename_scheduler.diff/services/Makefile.am'
--- .pc/10_rename_scheduler.diff/services/Makefile.am	2010-04-22 09:12:27 +0000
+++ .pc/10_rename_scheduler.diff/services/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-INCLUDES = -I$(srcdir)/../minilzo
-
-lib_LTLIBRARIES = libicecc.la
-
-libicecc_la_SOURCES = job.cpp comm.cpp getifaddrs.cpp logging.cpp tempfile.c platform.cpp
-libicecc_la_LIBADD = ../minilzo/libminilzo.la -ldl
-libicecc_la_CFLAGS = -fPIC -DPIC
-libicecc_la_CXXFLAGS = -fPIC -DPIC
-
-ice_HEADERS = job.h comm.h
-noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
-icedir = $(includedir)/icecc
-
-sbin_PROGRAMS = scheduler
-scheduler_SOURCES = scheduler.cpp
-scheduler_LDADD = libicecc.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = icecc.pc
-

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-08-14 09:56:52 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-fix_gcc_4.6_support.diff
-10_rename_scheduler.diff

=== removed directory '.pc/fix_gcc_4.6_support.diff'
=== removed directory '.pc/fix_gcc_4.6_support.diff/client'
=== removed file '.pc/fix_gcc_4.6_support.diff/client/icecc-create-env'
--- .pc/fix_gcc_4.6_support.diff/client/icecc-create-env	2011-08-14 09:56:52 +0000
+++ .pc/fix_gcc_4.6_support.diff/client/icecc-create-env	1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-#! /usr/bin/env bash
-# icecc -- A simple distributed compiler system
-#
-# Copyright (C) 2004 by the Icecream Authors
-# GPL
-
-target_files=
-
-is_darwin=0
-if test `uname` = Darwin; then
-  is_darwin=1
-fi
-
-is_contained ()
-{
-  case " $target_files " in
-    *" $1 "* ) return 0 ;;
-    *"=$1 "* ) return 0;;
-    * ) return 1 ;;
-  esac
-}
-
-add_file ()
-{
-  local name="$1"
-  local path="$1";
-  if test -n "$2"; then
-    name="$2"
-  fi
-  test -z "$name" && return
-  # ls -H isn't really the same as readlink, but
-  # readlink is not portable enough. 
-  path=`ls -H $path`
-  toadd="$name=$path"
-  if test "$name" = "$path"; then
-    toadd=$path
-  fi
-  is_contained "$toadd" && return
-  echo "adding file $toadd"
-  target_files="$target_files $toadd"
-  if test -x "$path"; then
-    # Only call ldd when it makes sense
-    if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then
-	if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then
-	   # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc
-		# this regexp parse the outputs like:
-		# ldd /usr/bin/gcc
-		#         linux-gate.so.1 =>  (0xffffe000)
-		#         libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000)
-		#         /lib/ld-linux.so.2 (0xb7fe8000)
-		# covering both situations ( with => and without )
-           for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do
-	      test -f "$lib" || continue
-	      # Check wether the same library also exists in the parent directory,
-	      # and prefer that on the assumption that it is a more generic one.
-	      local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'`
-	      test -f "$baselib" && lib=$baselib
-              add_file "$lib"
-           done
-        fi
-    elif test "$is_darwin" = 1; then
-          for lib in `otool -L "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do
-	    test -f "$lib" || continue
-	    # Check wether the same library also exists in the parent directory,
-	    # and prefer that on the assumption that it is a more generic one.
-	    local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'`
-	    test -f "$baselib" && lib=$baselib
-            add_file "$lib"
-         done
-    fi
-  fi
-}
-
-# backward compat
-if test "$1" = "--respect-path"; then
-  shift
-fi
-
-added_gcc=$1
-shift
-added_gxx=$1
-
-if test -z "$added_gcc" || test -z "$added_gxx"; then
-	echo "usage: $0 <gcc_path> <g++_path>"
-	exit 1
-fi
-	
-if ! test -x "$added_gcc" ; then
-  echo "'$added_gcc' is no executable."
-  exit 1
-fi
-
-if ! test -x "$added_gxx" ; then
-  echo "'$added_gcc' is no executable."
-  exit 1
-fi
-
-add_file $added_gcc /usr/bin/gcc
-add_file $added_gxx /usr/bin/g++
-add_file /usr/bin/as
-
-if test "$is_darwin" = 1; then
-    # add dynamic linker
-    add_file /usr/lib/dyld
-    real_file=`/usr/bin/gcc --version | head -n 1 2>&1 | cut -d" " -f1`
-    add_file /usr/bin/$real_file
-    real_file=`/usr/bin/g++ --version | head -n 1 2>&1 | cut -d" " -f1`
-    add_file /usr/bin/$real_file
-    real_file=`/usr/bin/as -micha -- < /dev/null 2>&1 | cut -d: -f1`
-    add_file $real_file
-fi
-
-
-add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1
-add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus
-specfile=`$added_gcc -print-file-name=specs`
-if test -n "$specfile" && test "$specfile" != "specs" && test -e "$specfile"; then
-  add_file "$specfile"
-fi
-
-plugin_name=liblto_plugin.so
-plugin=`$added_gcc -print-prog-name=$plugin_name`
-if test -n "$plugin" && test "$plugin" != "$plugin_name" && test -e "$plugin"; then
-  add_file "$plugin" "$plugin"
-fi
-
-# for ldconfig -r to work, ld.so.conf must not contain relative paths
-# in include directives. Make them absolute.
-tmp_ld_so_conf=`mktemp /tmp/icecc_ld_so_confXXXXXX`
-while read directive path; do
-  if [ "$directive" = "include" -a "${path:0:1}" != "/" ]; then
-    path="/etc/$path"
-  fi
-  echo "$directive $path"
-done </etc/ld.so.conf >$tmp_ld_so_conf
-add_file $tmp_ld_so_conf /etc/ld.so.conf
-
-tempdir=`mktemp -d /tmp/iceccenvXXXXXX`
-# special case for weird multilib setups
-for dir in /lib /lib64 /usr/lib /usr/lib64; do
-    test -L $dir && cp -p $dir $tempdir$dir
-done
-
-new_target_files=
-for i in $target_files; do 
- case $i in
-   *=/*)
-    target=`echo $i | cut -d= -f1`
-    path=`echo $i | cut -d= -f2`
-    ;;
-   *)
-    path=$i
-    target=$i
-    ;;
-  esac
-  mkdir -p $tempdir/`dirname $target`
-  cp -p $path $tempdir/$target
-  if test -f $tempdir/$target -a -x $tempdir/$target; then
-    strip -s $tempdir/$target 2>/dev/null
-  fi
-  target=`echo $target | cut -b2-`
-  new_target_files="$new_target_files $target"
-done
-
-if test -x /sbin/ldconfig; then
-   mkdir -p $tempdir/var/cache/ldconfig
-   /sbin/ldconfig -r $tempdir
-   new_target_files="$new_target_files etc/ld.so.cache"
-fi
-
-md5sum=NONE
-for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5 /sbin/md5; do
-   if test -x $file; then
-	md5sum=$file
-        break
-   fi
-done
-
-# now sort the files in order to make the md5sums independent
-# of ordering
-target_files=`for i in $new_target_files; do echo $i; done | sort`
-md5=`for i in $target_files; do $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'` || {
-  echo "Couldn't compute MD5 sum."
-  exit 2
-}
-echo "creating $md5.tar.gz"
-mydir=`pwd`
-cd $tempdir
-tar -czhf "$mydir/$md5".tar.gz $target_files || {
-  echo "Couldn't create archive"
-  exit 3
-}
-cd ..
-rm -rf $tempdir
-rm -f $tmp_ld_so_conf

=== modified file 'client/icecc-create-env'
--- client/icecc-create-env	2011-08-14 09:56:52 +0000
+++ client/icecc-create-env	2012-02-27 01:04:17 +0000
@@ -119,7 +119,7 @@
 fi
 
 plugin_name=liblto_plugin.so
-plugin=`$added_gcc -print-file-name=$plugin_name`
+plugin=`$added_gcc -print-prog-name=$plugin_name`
 if test -n "$plugin" && test "$plugin" != "$plugin_name" && test -e "$plugin"; then
   add_file "$plugin" "$plugin"
 fi

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-17 16:26:59 +0000
+++ debian/changelog	2012-02-27 01:04:17 +0000
@@ -1,3 +1,9 @@
+icecc (0.9.7-4ubuntu1) precise; urgency=low
+
+  * Fix pkglibdir issue (LP: #935178). 
+
+ -- Leo Iannacone <[e-mail]>  Mon, 27 Feb 2012 01:42:39 +0100
+
 icecc (0.9.7-4) unstable; urgency=low
 
   * Fix typo: ICECC_ALLOW_REMOTE.

=== modified file 'debian/control'
--- debian/control	2011-07-28 15:06:47 +0000
+++ debian/control	2012-02-27 01:04:17 +0000
@@ -1,7 +1,8 @@
 Source: icecc
 Section: devel
 Priority: optional
-Maintainer: Debian KDE Extras Team <[e-mail]> 
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]> 
 Uploaders: Fathi Boudra <[e-mail]>, Mark Purcell <[e-mail]>
 Build-Depends: debhelper (>= 7.4.15), autoconf, automake, libtool, docbook2x,
  libdevstat-dev [kfreebsd-any]

=== added file 'debian/patches/20_fix_pkglibdir.patch'
--- debian/patches/20_fix_pkglibdir.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/20_fix_pkglibdir.patch	2012-02-27 01:04:17 +0000
@@ -0,0 +1,20 @@
+Description: Fix pkglibdir as  not a legitimate directory for `SCRIPTS'.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935178
+
+---
+ client/Makefile.am |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- icecc.orig/client/Makefile.am
++++ icecc/client/Makefile.am
+@@ -1,7 +1,8 @@
+ INCLUDES = -I$(srcdir)/../services
+ 
+ bin_PROGRAMS = icecc
+-pkglib_SCRIPTS = icecc-create-env
++iecc_pkglibdir = $(pkglibdir)
++iecc_pkglib_SCRIPTS = icecc-create-env
+ icecc_SOURCES = main.cpp arg.cpp cpp.cpp local.cpp remote.cpp util.cpp md5.c safeguard.cpp
+ icecc_LDADD = ../services/libicecc.la $(LIBRSYNC)
+ noinst_HEADERS = client.h md5.h util.h

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-14 09:56:52 +0000
+++ debian/patches/series	2012-02-27 01:04:17 +0000
@@ -1,2 +1,3 @@
 fix_gcc_4.6_support.diff
 10_rename_scheduler.diff
+20_fix_pkglibdir.patch

=== modified file 'services/Makefile.am'
--- services/Makefile.am	2010-04-22 09:12:27 +0000
+++ services/Makefile.am	2012-02-27 01:04:17 +0000
@@ -11,9 +11,9 @@
 noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
 icedir = $(includedir)/icecc
 
-sbin_PROGRAMS = icecc-scheduler
-icecc_scheduler_SOURCES = scheduler.cpp
-icecc_scheduler_LDADD = libicecc.la
+sbin_PROGRAMS = scheduler
+scheduler_SOURCES = scheduler.cpp
+scheduler_LDADD = libicecc.la
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = icecc.pc