diff -Nru uck-2.4.7+SNAPSHOT150118192508/debian/bzr-builder.manifest uck-2.4.7/debian/bzr-builder.manifest --- uck-2.4.7+SNAPSHOT150118192508/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ uck-2.4.7/debian/bzr-builder.manifest 2017-03-24 23:25:53.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-0~20 +lp:ubuntu/wily/uck revid:package-import@ubuntu.com-20150731120411-h62ckd83g56igmx0 diff -Nru uck-2.4.7+SNAPSHOT150118192508/debian/changelog uck-2.4.7/debian/changelog --- uck-2.4.7+SNAPSHOT150118192508/debian/changelog 2015-01-18 21:35:33.000000000 +0000 +++ uck-2.4.7/debian/changelog 2017-03-24 23:25:53.000000000 +0000 @@ -1,10 +1,15 @@ -uck (2.4.7+SNAPSHOT150118192508-0ubuntu1ppa3~trusty) trusty; urgency=low +uck (2.4.7-0~20~ubuntu16.04.1) xenial; urgency=low - [ BigK ] - * Fix lp: #1201911 - * Fix lp: #1325142 + * Auto build. - -- BigK Sun, 18 Jan 2015 22:27:34 +0100 + -- Sonicwalker Fri, 24 Mar 2017 23:25:53 +0000 + +uck (2.4.7-0ubuntu2) wily; urgency=medium + + * debian/control: + - Replace dependency on dummy mktemp package with coreutils + + -- Robert Ancell Fri, 31 Jul 2015 12:04:11 +1200 uck (2.4.7-0ubuntu1) trusty; urgency=low @@ -68,154 +73,3 @@ -- Fabrizio Balliano Mon, 04 Apr 2011 01:47:14 +0200 -uck (2.4.3-0ubuntu1) maverick; urgency=low - * New upstream release: - - yaboot dep was added (only for ppc) - Fixes LP: #516231 - - Added code to remember kernel update state (shared /var/run issue) - Fixes LP: #682108 - - Applied patch to handle changed named of syslinux config file. - Fixes LP: #681032 - - uck-remaster-prepare-alternate and uck-remaster-finalize-alternate now - support all architectures (and not only i386) - Fixes LP: #693620 - - -- Fabrizio Balliano Wed, 29 Dec 2010 01:47:14 +0200 - -uck (2.4.0-0ubuntu1) maverick; urgency=low - - * New upstream release: - - Support for maverick was added. - Fixes LP: #659572 and #618705 and #664709. - - gvfs problem in chroot environment was solved. - Fixes LP: #657689. - * Depends on gfxboot-dev (only >= maverick). - * Bump Standards. - - -- Fabrizio Balliano Thu, 18 Nov 2010 01:47:14 +0200 - -uck (2.2.1-0ubuntu1) maverick; urgency=low - - * New upstream release: - - Brasero style checksums support was added (#575825) - - bugs with virtual packages for languages packs were solved. - Fixes LP: #580578 and #525635. - - workarout for portuguese (pt_PT) language management was implemented, - fixes LP: #582200 - - GUI now uses kdialog, zenity, dialog or builtin (in that order) if - available. Fixes LP: #577197 - * Depends on sudo (LP: #602401) - * Bump Standards. - * Suggests on brasero | k3b | burn. - - -- Alessio Treglia Wed, 20 Jul 2010 01:47:14 +0200 - -uck (2.2.0-0ubuntu1) maverick; urgency=low - - * New upstream release: - - Add Ubuntu 10.04 support (LP: #544555). - - Fix crash due to the use of hard coded path for custom scripts, - fixes LP: #547260. - * Drop all patches, applied upstream. - * Bump Standards. - * Remove debian/README.source, now unnecessary. - - -- Alessio Treglia Sat, 08 May 2010 01:47:14 +0200 - -uck (2.0.12-0ubuntu2) lucid; urgency=low - - * Depends on wget, lzma (LP: #511301). - - -- Alessio Treglia Sun, 31 Jan 2010 20:13:29 +0100 - -uck (2.0.12-0ubuntu1) lucid; urgency=low - - * New upstream release: - - GUI: - + splash notes were updated - + a new configuration screen was added to allow selecting which - languages will be available on the livecd boot splash (gfxboot). - This was necessary because the language packs codes do not match - gfxbook locales. - - the default gfxboot language can be chosen only between the - gfxboot available languages (easier selection). - - default gfxboot language selection was made mandatory - - Backend: - + a workaround for the chrooted gnome-terminal was implemented - * Fixes: - - LP: #269741 - - LP: #228235 - - LP: #407443 - - -- Alessio Treglia Fri, 22 Jan 2010 18:45:17 +0100 - -uck (2.0.11-0ubuntu1) lucid; urgency=low - - * New upstream release (also fixes LP: #478662). - * Switch to 3.0 (quilt) format. - * debian/control: - - Drop bzr from Depends field. - - Adjust debhelper versioned build-dependency. - - Drop build-dependency on quilt. - - Update debian/copyright. - - -- Alessio Treglia Wed, 20 Jan 2010 21:03:34 +0100 - -uck (2.0.10-0ubuntu1) lucid; urgency=low - - * New upstream release, also fixes LP: #271677. - * debian/{compat,control,rules}: Switch to debhelper 7. - * debian/{control,rules,README.source}: - - Add support for the quilt patch system. - * debian/control: - - Bump Standards. - - Add ${misc:Depends} to Depends field. - - Bump debhelper build-dependency. - * debian/{examples,uck.install}: - - Install examples with dh_installexamples. - * Provide the package with a XPM icon. - * Add doc-base support. - * debian/menu: Add icon field. - * debian/copyright: Adopt Debian DEP-5 spec. - * debian/patches/01-fix_manpage.patch: - - Fix upstream's manpage to make lintian happy. - - -- Alessio Treglia Sun, 08 Nov 2009 01:48:25 +0100 - -uck (2.0.9-0ubuntu1) karmic; urgency=low - - * New upstream release. - * debian/rules: - * Clean old stuffs. - * download-gfxboot-theme-ubuntu has been removed by upstream. - * Use wildcard to install all manpages. - * Remove unuseful debian/uck.manpages. - * debian/control: - - Depends on bzr. - - Bump-up Standard-Version. - * debian/copyright: - - Use new copyright placeholder © instead of (C). - - Update debian packaging copyright information. - - -- Alessio Treglia Sat, 02 May 2009 21:10:58 +0200 - -uck (2.0.8-0ubuntu1) jaunty; urgency=low - - * New upstream release (LP: #325864). - * Remove debian/uck-gui.1, now it is provided by upstream. - * debian/rules: - - Don't use dh_link, now install all the binaries into /usr/bin/. - - dh_installman reads manpages list from debian/uck.manpages. - - Remove get-orig-source target, upstream doesn't provide debian dir - anymore, so we don't need to repack the source tarball. - * debian/copyright: - - Update copyright information. - - -- Alessio Treglia Thu, 05 Feb 2009 19:23:18 +0100 - -uck (2.0.7-0ubuntu1) jaunty; urgency=low - - * Initial release (LP: #267355). - * Remove the debian/ dir from upstream tarball. - - -- Alessio Treglia Tue, 20 Jan 2009 17:25:17 +0100 diff -Nru uck-2.4.7+SNAPSHOT150118192508/debian/control uck-2.4.7/debian/control --- uck-2.4.7+SNAPSHOT150118192508/debian/control 2013-11-19 08:46:33.000000000 +0000 +++ uck-2.4.7/debian/control 2017-03-24 23:25:53.000000000 +0000 @@ -17,7 +17,7 @@ fakeroot, build-essential, file, - mktemp (>= 1.5), + coreutils, xauth, gnupg, wget, diff -Nru uck-2.4.7+SNAPSHOT150118192508/libraries/customization-profiles/localized_cd/customize_iso uck-2.4.7/libraries/customization-profiles/localized_cd/customize_iso --- uck-2.4.7+SNAPSHOT150118192508/libraries/customization-profiles/localized_cd/customize_iso 2015-01-18 18:11:17.000000000 +0000 +++ uck-2.4.7/libraries/customization-profiles/localized_cd/customize_iso 2012-10-20 20:20:20.000000000 +0000 @@ -127,28 +127,19 @@ # Copy kernel and initrd, in case it was changed during installation VMLINUZ=$(get_latest_kernel) -VMLINUZ_EFI="$VMLINUZ".efi.signed -INITRD="$REMASTER_DIR"/boot/initrd.img-$(echo `basename $VMLINUZ` | cut -d'-' -f 2-) -if [ -e "$INITRD" ] +if [ "$VMLINUZ" != "" ] then - - if [ -e "$ISO_REMASTER_DIR/casper/vmlinuz" -a -e "$VMLINUZ" ] + INITRD="$REMASTER_DIR"/boot/initrd.img-$(echo `basename $VMLINUZ` | cut -d'-' -f 2-) + if [ -e "$VMLINUZ" -a -e "$INITRD" ] then - echo "Updating kernel $VMLINUZ to $ISO_REMASTER_DIR/casper/vmlinuz" + echo "Updating kernel:" + echo " kernel=$VMLINUZ" + echo " initrd=$INITRD" cp -f "$VMLINUZ" "$ISO_REMASTER_DIR/casper/vmlinuz" + cp -f "$INITRD" "$ISO_REMASTER_DIR/casper/initrd.gz" + else + echo "Not updating kernel as initrd not present" fi - - if [ -e "$ISO_REMASTER_DIR/casper/vmlinuz.efi" -a -e "$VMLINUZ_EFI" ] - then - echo "Updating kernel $VMLINUZ_EFI to $ISO_REMASTER_DIR/casper/vmlinuz.efi" - cp -f "$VMLINUZ_EFI" "$ISO_REMASTER_DIR/casper/vmlinuz.efi" - fi - - echo "Updating initrd $INITRD to $ISO_REMASTER_DIR/casper/initrd.gz" - cp -f "$INITRD" "$ISO_REMASTER_DIR/casper/initrd.gz" - -else - echo "Not updating kernel as initrd not present" fi # Misc fixup for Karmic diff -Nru uck-2.4.7+SNAPSHOT150118192508/libraries/remaster-live-cd.sh uck-2.4.7/libraries/remaster-live-cd.sh --- uck-2.4.7+SNAPSHOT150118192508/libraries/remaster-live-cd.sh 2015-01-18 18:06:41.000000000 +0000 +++ uck-2.4.7/libraries/remaster-live-cd.sh 2012-10-20 20:20:20.000000000 +0000 @@ -387,9 +387,6 @@ echo "Deactivating initctl..." chroot "$REMASTER_DIR" mv /sbin/initctl /sbin/initctl.uck_blocked chroot "$REMASTER_DIR" ln -s /bin/true /sbin/initctl - - echo "Hacking invoke-rc.d to ignore missing init scripts..." - chroot "$REMASTER_DIR" sed -i -e "s/exit 100/exit 0 #exit 100/" /usr/sbin/invoke-rc.d echo "Deactivating update-grub..." chroot "$REMASTER_DIR" mv /usr/sbin/update-grub /usr/sbin/update-grub.uck_blocked @@ -400,13 +397,8 @@ chroot "$REMASTER_DIR" ln -s /bin/true /usr/sbin/grub-probe echo "Hacking grub-probe postinst/postrm..." - chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/true #exec update-grub/" /etc/kernel/postinst.d/zz-update-grub - chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/true #exec update-grub/" /etc/kernel/postrm.d/zz-update-grub - - if [ ! -e "$REMASTER_DIR/scripts" ]; then - echo "Linking missing /scripts dir..." - chroot "$REMASTER_DIR" ln -s /usr/share/initramfs-tools/scripts /scripts - fi + chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/#exec update-grub/" /etc/kernel/postinst.d/zz-update-grub + chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/#exec update-grub/" /etc/kernel/postrm.d/zz-update-grub echo "Remembering kernel update state..." update_flags="reboot-required reboot-required.pkgs do-not-hibernate" @@ -431,9 +423,6 @@ echo "Reactivating initctl..." chroot "$REMASTER_DIR" rm /sbin/initctl chroot "$REMASTER_DIR" mv /sbin/initctl.uck_blocked /sbin/initctl - - echo "Restoring invoke-rc.d..." - chroot "$REMASTER_DIR" sed -i -e "s/exit 0 #exit 100/exit 100/" /usr/sbin/invoke-rc.d echo "Reactivating update-grub..." chroot "$REMASTER_DIR" rm /usr/sbin/update-grub @@ -444,14 +433,9 @@ chroot "$REMASTER_DIR" mv /usr/sbin/grub-probe.uck_blocked /usr/sbin/grub-probe echo "Reactivating grub-probe postinst/postrm..." - chroot "$REMASTER_DIR" sed -i -e "s/true #exec update-grub/exec update-grub/" /etc/kernel/postinst.d/zz-update-grub - chroot "$REMASTER_DIR" sed -i -e "s/true #exec update-grub/exec update-grub/" /etc/kernel/postrm.d/zz-update-grub + chroot "$REMASTER_DIR" sed -i -e "s/#exec update-grub/exec update-grub/" /etc/kernel/postinst.d/zz-update-grub + chroot "$REMASTER_DIR" sed -i -e "s/#exec update-grub/exec update-grub/" /etc/kernel/postrm.d/zz-update-grub - if [ -L "$REMASTER_DIR/scripts" ]; then - echo "Removing linked /scripts dir..." - chroot "$REMASTER_DIR" rm /scripts - fi - UCK_USER_HOME_DIR=`xauth info|grep 'Authority file'| sed "s/[ \t]//g" | sed "s/\/\.Xauthority//" | cut -d ':' -f2` if [ `echo $UCK_USER_HOME_DIR | cut -d '/' -f2` == 'home' ] ; then echo "Removing /home/username directory..."