[Debian-live-changes] r2117 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-16 13:36:46 +0000 (Sat, 16 Jun 2007)
New Revision: 2117

Modified:
   dists/trunk/live-helper/helpers/lh_binary_live-installer
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_live-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_live-installer	2007-06-16 13:32:05 UTC (rev 2116)
+++ dists/trunk/live-helper/helpers/lh_binary_live-installer	2007-06-16 13:36:46 UTC (rev 2117)
@@ -243,12 +243,6 @@
 	rm -f "${EXCLUDE}"_*.udeb
 done
 
-# Including local udebs
-if ls binary_local-udebs/* &> /dev/null
-then
-	cp binary_local-udebs/*.udeb binary.udeb
-fi
-
 # Moving udebs
 for UDEB in ${UDEBS}
 do
@@ -259,6 +253,36 @@
 	fi
 done
 
+# Including local udebs
+if ls binary_local-udebs/* &> /dev/null
+then
+	for FILE in binary_local-udebs/*.udeb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		mv "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
 # Creating udeb indices
 mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
 apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages