Bug#685791: live-build: updated and fixed patch

[Thanatermesis <thanatermesis@gmail.com>]

Package: live-build
Version: 3.0~a57-1
Followup-For: Bug #685791

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

The previous patch adds a feature for add /etc/apt/apt.conf.d/ files
just like the preferences one, but looking at the bug #685924 it is also
affected, so there is an updated patch with the bug fixed too

- -- Package-specific info:

- -- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages live-build depends on:
ii  debootstrap  1.0.42

Versions of packages live-build recommends:
ii  cpio                            2.11-8
ii  gnu-fdisk                       1.2.4-3.1
ii  live-boot-doc                   3.0~a35-1
ii  live-config-doc                 3.0~a33-1
ii  live-manual-html [live-manual]  1:3.0~a13-1

Versions of packages live-build suggests:
ii  dosfstools       3.0.13-1
ii  fakeroot         1.18.4-2
ii  genisoimage      9:1.1.11-2
ii  git              1:1.7.10.4-1
ii  memtest86+       4.20-1.1
ii  mtools           4.0.17-1
pn  parted           <none>
ii  squashfs-tools   1:4.2-5
ii  sudo             1.8.5p2-1
pn  syslinux | grub  <none>
pn  uuid-runtime     <none>
pn  win32-loader     <none>

- -- no debconf information

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

iQIcBAEBCAAGBQJQOjV1AAoJEKLHmb/f+NfC+d0QAKUgGQ4dCuWjAewrLHOwLOA5
bM71WfejZQYyaszckywaBNNndKBGwpAVAimLSOipXlwpVgDZ0S3xWB1XZwnZP1Ef
h4dCxAZbkYTEp4WETL2W+7Udgw+yttkTKglhDcNNRBZIE3xsNW5RM9n+5iJnxoml
WXyujzbz/3SRIx9CPf+j9ZUhuM9/pbpI+3lPdN7D/BV7QOlA0eHyeoj8aq83iAd1
JvM13ih+R06ca7UeDeeM2LekLjB2ppmPfBstiI39/DVPUhUcY8cyr0BHkzQVZwlA
x5PwTOVUbRbDn0pILqpLCcb6i2WNFDaTzV+cgBCFUuL/NGSaSNF7sAOrpfMRSezM
gIEJkSSp4zYQ1OxWTnBOyVl576pkGSwOZdVcV0iXFl77y7ddw7D3+eVVDCld0OAX
U6aXPUdfB6lVa7r11Oifaa4h7j0KMBwfYBlp6jRAntoMOAnFlLd/wWenUMqIWSnV
jwTCSCVJNsZ6u476w9yUF0bkFuLTXL8ikzt6EhTXRJFU1OiUq/72lYgH+8KHpg3R
xGYSI4IJcOn/IWZp+hFS4/6tL1uPncj/m3aj82t1QoKnbhDlY2yUil9yN0l8k7tX
ZrxCLGg5rRY1Hv3TA3RhpDvD49Dw+sfn1xk2XI7cyzJOCBgv92xJUoRm6gfIXxFZ
tZUSmmrUtYeGYFBz0zcw
=cUjZ
-----END PGP SIGNATURE-----

--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -97,6 +97,20 @@ case "${1}" in
 			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
 		fi

+		# Configuring apt conf.d
+		if Find_files config/chroot_apt/*.conf
+		then
+			for _FILE in config/chroot_apt/*.conf
+			do
+				if [ -f chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig
+				fi
+
+				cp -aL ${_FILE} chroot/etc/apt/apt.conf.d
+			done
+		fi
+
 		# Configuring apt preferences
 		if [ -f config/chroot_apt/preferences ]
 		then
@@ -265,6 +279,18 @@ EOF
 			fi
 		fi

+		# Deconfiguring apt conf.d
+		if Find_files config/chroot_apt/*.conf
+		then
+			for _FILE in config/chroot_apt/*.conf
+			do
+				if [ -f chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig ]
+				then
+					mv chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig chroot/etc/apt/apt.conf.d/$(basename ${_FILE})
+				fi
+			done
+		fi
+
 		# Deconfiguring apt preferences
 		if [ -f config/chroot_apt/preferences ]
 		then