mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-03 18:34:11 +00:00 
			
		
		
		
	Import patches-unapplied version 2.307 to ubuntu/wily-proposed
Imported using git-ubuntu import. Changelog parent: 04b0ecd5a61912d3ba2e924c152b482593b7321b New changelog entries: * Remove duplicated code leftover in the previous desktop-next changeset
This commit is contained in:
		
							parent
							
								
									04b0ecd5a6
								
							
						
					
					
						commit
						123b33de50
					
				
							
								
								
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,9 @@
 | 
			
		||||
livecd-rootfs (2.307) wily; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * Remove duplicated code leftover in the previous desktop-next changeset
 | 
			
		||||
 | 
			
		||||
 -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 05 Jun 2015 10:55:39 +0200
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (2.306) wily; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * Create hooks and image build config for the ubuntu-desktop-next
 | 
			
		||||
 | 
			
		||||
@ -349,14 +349,6 @@ case $PROJECT:$SUBPROJECT in
 | 
			
		||||
    ;;
 | 
			
		||||
esac
 | 
			
		||||
 | 
			
		||||
if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then
 | 
			
		||||
    LB_LINUX_FLAVOURS=none
 | 
			
		||||
 | 
			
		||||
    # rename to have the right prefix etc
 | 
			
		||||
    mv device.tar.gz "$PREFIX.device.tar.gz"
 | 
			
		||||
    
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
for FLAVOUR in $LB_LINUX_FLAVOURS; do
 | 
			
		||||
	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
 | 
			
		||||
		continue
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user