Update patches and links for new version

.gitignore

+.pc/

debian/changelog

+live-build (4.0.3-1kali1) kali-dev; urgency=medium
+
+  * Import new debian version
+  * Drop patches add-xfsprogs-jfsutils-to-d-i and 
+    fix-kernel-metapackages-used-in-di-step as it's already in debian version.
+  * Add a link to kali-rolling
+
+ -- Sophie Brun <sophie@freexian.com>  Thu, 27 Nov 2014 16:00:47 +0100
+
 live-build (4.0.3-1) unstable; urgency=low
 
   [ Richard Nelson ]

debian/live-build.links

-usr/share/live/build/data/debian-cd/wheezy usr/share/live/build/data/debian-cd/kali
-usr/share/live/build/data/debian-cd/wheezy usr/share/live/build/data/debian-cd/kali-dev
+usr/share/live/build/data/debian-cd/jessie usr/share/live/build/data/debian-cd/kali
+usr/share/live/build/data/debian-cd/jessie usr/share/live/build/data/debian-cd/kali-dev
+usr/share/live/build/data/debian-cd/jessie usr/share/live/build/data/debian-cd/kali-rolling

debian/patches/add-efi-support.patch

@@ -9,7 +9,7 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
 
 --- a/scripts/build/binary
 +++ b/scripts/build/binary
-@@ -72,6 +72,9 @@ lb binary_loadlin ${@}
+@@ -69,6 +69,9 @@ lb binary_loadlin ${@}
  lb binary_win32-loader ${@}
  lb binary_includes ${@}
  lb binary_hooks ${@}
@@ -21,9 +21,9 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
  if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
 --- a/scripts/build/binary_iso
 +++ b/scripts/build/binary_iso
-@@ -88,6 +88,23 @@ fi
+@@ -82,6 +82,23 @@ fi
  # Handle xorriso generic options
- XORRISO_OPTIONS="-r -J -joliet-long -l -cache-inodes"
+ XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
  
 +case "${LB_BUILD_WITH_CHROOT}" in
 +	true)
@@ -43,9 +43,9 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
 +esac
 +
  # Handle xorriso live-build specific options
- case "${LB_PARENT_DISTRIBUTION}" in
- 	squeeze)
-@@ -180,6 +197,26 @@ case "${LB_BOOTLOADER}" in
+ if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
+ then
+@@ -155,6 +172,26 @@ case "${LB_BOOTLOADER}" in
  		;;
  esac
  

debian/patches/add-xfsprogs-jfsutils-to-d-i.patch

-Description: Ensure xfsprogs and jfsutils are available in the ISO
- Otherwise users opting for XFS and JFS and installing without network
- won't have them and the (first) boot can be interrupted due to this.
-Author: Raphaël Hertzog <hertzog@debian.org>
-Bug-Kali: http://bugs.kali.org/view.php?id=467
-
----
- debian/changelog                      | 8 ++++++++
- scripts/build/binary_debian-installer | 2 +-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
---- a/scripts/build/binary_debian-installer
-+++ b/scripts/build/binary_debian-installer
-@@ -413,7 +413,7 @@ then
- 			;;
- 	esac
- 
--	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2"
-+	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2 xfsprogs jfsutils"
- 
- 	case "${LB_MODE}" in
- 		debian)
--- 
-1.8.4.rc3
-

debian/patches/fix-default-armhf-kernel-flavours.patch

@@ -8,7 +8,7 @@ Author: Raphaël Hertzog <hertzog@debian.org>
 
 --- a/functions/defaults.sh
 +++ b/functions/defaults.sh
-@@ -674,15 +674,15 @@ Set_defaults ()
+@@ -525,15 +525,15 @@ Set_defaults ()
  				*)
  					# armel will have special images: one rootfs image and many additional kernel images.
  					# therefore we default to all available armel flavours

debian/patches/fix-kernel-metapackages-used-in-di-step.patch

-Description: Fix kernel meta-packages required for d-i
- The linux-image-2.6-* meta-packages were transitional and are gone
- in the latest version used by Kali.
- .
- Instead use the linux-image-* meta-packages.
-Author: Raphaël Hertzog <hertzog@debian.org>
-
---- a/scripts/build/binary_debian-installer
-+++ b/scripts/build/binary_debian-installer
-@@ -353,7 +353,7 @@ then
- 					;;
- 
- 				*)
--					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
-+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
- 					;;
- 			esac
- 			;;
-@@ -381,7 +381,7 @@ then
- 					;;
- 
- 				*)
--					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
-+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-486 linux-image-686-pae"
- 					;;
- 			esac
- 			;;
-@@ -394,7 +394,7 @@ then
- 					;;
- 
- 				*)
--					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
-+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-sparc64 linux-image-sparc64-smp"
- 					;;
- 			esac
- 			;;
-@@ -407,7 +407,7 @@ then
- 					;;
- 
- 				*)
--					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
-+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
- 					;;
- 			esac
- 			;;

debian/patches/series

-add-xfsprogs-jfsutils-to-d-i.patch
-fix-kernel-metapackages-used-in-di-step.patch
 fix-default-armhf-kernel-flavours.patch
 add-efi-support.patch