mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-04 10:54:07 +00:00 
			
		
		
		
	Import patches-unapplied version 0.32 to ubuntu/gutsy
Imported using git-ubuntu import.
Changelog parent: 13c07f49ddcb79b22e3766ef0d97369bde85b416
New changelog entries:
  * For Edubuntu images, include the intersection of edubuntu-ship-addon and
    edubuntu-live in manifest-desktop, so that packages also on the add-on
    CD aren't removed after installation by ubiquity.
			
			
This commit is contained in:
		
							parent
							
								
									13c07f49dd
								
							
						
					
					
						commit
						be02feaeba
					
				
							
								
								
									
										8
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,11 @@
 | 
				
			|||||||
 | 
					livecd-rootfs (0.32) gutsy; urgency=low
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  * For Edubuntu images, include the intersection of edubuntu-ship-addon and
 | 
				
			||||||
 | 
					    edubuntu-live in manifest-desktop, so that packages also on the add-on
 | 
				
			||||||
 | 
					    CD aren't removed after installation by ubiquity.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 -- Colin Watson <cjwatson@ubuntu.com>  Sat, 21 Jul 2007 14:43:09 +0100
 | 
				
			||||||
 | 
					
 | 
				
			||||||
livecd-rootfs (0.31) gutsy; urgency=low
 | 
					livecd-rootfs (0.31) gutsy; urgency=low
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  * Remove a duplicate "copyright" from debian/copyright.  Typing is hard.
 | 
					  * Remove a duplicate "copyright" from debian/copyright.  Typing is hard.
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							@ -7,7 +7,7 @@ Standards-Version: 3.6.1.0
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
Package: livecd-rootfs
 | 
					Package: livecd-rootfs
 | 
				
			||||||
Architecture: all
 | 
					Architecture: all
 | 
				
			||||||
Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools
 | 
					Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools, grep-dctrl
 | 
				
			||||||
Suggests: partimage
 | 
					Suggests: partimage
 | 
				
			||||||
Description: construction script for the livecd rootfs
 | 
					Description: construction script for the livecd rootfs
 | 
				
			||||||
 livecd-rootfs provides the script used to create the root filesystem
 | 
					 livecd-rootfs provides the script used to create the root filesystem
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										11
									
								
								livecd.sh
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								livecd.sh
									
									
									
									
									
								
							@ -269,6 +269,17 @@ link_in_boot = $link_in_boot
 | 
				
			|||||||
    chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 | 
					    chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 | 
				
			||||||
	> livecd.${FSS}.manifest-desktop
 | 
						> livecd.${FSS}.manifest-desktop
 | 
				
			||||||
    chroot $ROOT apt-get -y install $LIVELIST </dev/null
 | 
					    chroot $ROOT apt-get -y install $LIVELIST </dev/null
 | 
				
			||||||
 | 
					    case $FS in
 | 
				
			||||||
 | 
						edubuntu)
 | 
				
			||||||
 | 
						    chroot $ROOT apt-cache dumpavail | \
 | 
				
			||||||
 | 
							grep-dctrl -nsPackage -FTask edubuntu-ship-addon -a \
 | 
				
			||||||
 | 
									      -FTask edubuntu-live | \
 | 
				
			||||||
 | 
							sort -u | \
 | 
				
			||||||
 | 
							xargs chroot $ROOT \
 | 
				
			||||||
 | 
							    dpkg-query -W --showformat='${Package} ${Version}\n' \
 | 
				
			||||||
 | 
							>> livecd.${FSS}.manifest-desktop
 | 
				
			||||||
 | 
						    ;;
 | 
				
			||||||
 | 
					    esac
 | 
				
			||||||
    chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 | 
					    chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 | 
				
			||||||
	> livecd.${FSS}.manifest
 | 
						> livecd.${FSS}.manifest
 | 
				
			||||||
    kill_users
 | 
					    kill_users
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user