--- gparted-0.1.orig/config.guess +++ gparted-0.1/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-12-23' +timestamp='2005-08-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -138,23 +138,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -if [ "${UNAME_SYSTEM}" = "Linux" ] ; then - eval $set_cc_for_build - cat << EOF > $dummy.c - #include - #ifdef __UCLIBC__ - # ifdef __UCLIBC_CONFIG_VERSION__ - LIBC=uclibc __UCLIBC_CONFIG_VERSION__ - # else - LIBC=uclibc - # endif - #else - LIBC=gnu - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` -fi - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -781,12 +764,7 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -801,7 +779,7 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) + x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -837,25 +815,25 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-${LIBC} + echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-${LIBC} + echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-${LIBC} + echo frv-unknown-linux-gnu exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:*) eval $set_cc_for_build @@ -873,8 +851,8 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -892,17 +870,17 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-${LIBC} + echo or32-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -915,37 +893,34 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-${LIBC} + echo x86_64-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -960,22 +935,20 @@ p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" + echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" + echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" exit ;; esac - # This should get integrated into the C code below, but now we hack - if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi # Determine whether the default compiler is a.out or elf eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -991,7 +964,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #ifdef __INTEL_COMPILER LIBC=gnu #else LIBC=gnuaout @@ -1001,7 +974,7 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1212,6 +1185,7 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1290,9 +1264,6 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 --- gparted-0.1.orig/config.sub +++ gparted-0.1/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-12-23' +timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,9 +119,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -172,10 +171,6 @@ -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -192,10 +187,6 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -243,12 +234,12 @@ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx | dvp \ + | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -266,14 +257,14 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | mt \ + | ms1 \ | msp430 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b \ @@ -295,13 +286,6 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; - ms1) - basic_machine=mt-unknown - ;; - nios2 | nios2-* | nios2 | nios2-*) - basic_machine=nios2-altera - os=-none - ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -352,7 +336,7 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | mt-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -694,24 +678,6 @@ basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -730,9 +696,6 @@ basic_machine=i386-pc os=-msdos ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; mvs) basic_machine=i370-ibm os=-mvs @@ -840,12 +803,6 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -902,10 +859,6 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -1228,15 +1181,14 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -irx*) + | -skyos* | -haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- gparted-0.1.orig/debian/copyright +++ gparted-0.1/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Daniel Holbach on +Sat, 29 Jan 2005 19:04:21 +0100. + +It was downloaded from http://gparted.sourceforge.net/download.php + +Upstream Author: + Bart Hakvoort + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- gparted-0.1.orig/debian/rules +++ gparted-0.1/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS := "--disable-update-mimedb" +DEB_INSTALL_MANPAGES_gparted := debian/gparted.1 + + +cleanbuilddir:: + rm -f $(CURDIR)/config.*.cdbs-orig + rm -f debian/gparted.1 + +makebuilddir:: + /usr/bin/docbook-to-man debian/gparted.sgml > debian/gparted.1 + --- gparted-0.1.orig/debian/changelog +++ gparted-0.1/debian/changelog @@ -0,0 +1,271 @@ +gparted (0.1-0ubuntu8) dapper; urgency=low + + * debian/patches/installer-mode.patch: Only emit "- FORMAT" instructions + if setting the partition type succeeded; avoids format instructions + being issued if e.g. a preceding resize failed. + + -- Colin Watson Fri, 26 May 2006 23:09:37 +0100 + +gparted (0.1-0ubuntu7) dapper; urgency=low + + * debian/patches/upstream-ntfsresize-fixes.patch: Backported from + upstream: + - Run a simulation before performing an NTFS resize. + - Run ntfsresize in info-only mode when checking filesystems. + + -- Colin Watson Tue, 23 May 2006 13:42:09 +0100 + +gparted (0.1-0ubuntu6) dapper; urgency=low + + * debian/patches/installer-mode.patch: + - Disable reiser4 in installer mode, since partman doesn't support it + yet (closes: Malone #32075). + - Change the toolbar style to icons-beside-text in installer mode and + mark the new toolbutton as important (closes: Malone #42723). + * debian/patches/ext3-before-ext2.patch: + - Default to ext3 rather than ext2 (closes: Malone #40586). + + -- Colin Watson Wed, 17 May 2006 19:30:53 +0100 + +gparted (0.1-0ubuntu5) dapper; urgency=low + + * debian/patches/installer-mode.patch: + Ensure all dialogs opened by the main window are transient against + the plug rather than the window when in installer mode. + + -- Daniel Silverstone Wed, 22 Mar 2006 12:12:59 +0000 + +gparted (0.1-0ubuntu4) dapper; urgency=low + + * debian/patches/privileged.patch: + - we use gksu now. + * debian/rules: + - dropped hack to distinguish between Ubuntu's / Debian's use of + gksudo/gksu. + * debian/control: + - dropped lsb-release as a Build-Dependency - not needed anymore. + * debian/patches/menu-change.patch: + - added X-KDE-SubstituteUID=true (Malone: #34598) + + -- Daniel Holbach Mon, 20 Mar 2006 19:56:28 +0100 + +gparted (0.1-0ubuntu3) dapper; urgency=low + + * debian/patches/installer-mode.patch: + - Ensure the main window is not visible when embedded. + - Ensure the format-to menu is not visible when embedded. + - Make the toolbar use icons-only mode when embedded + - Instead of formatting, issue format instructions to stdout when embedded + - Make the action dialog transient to the plug when embedded + - Make the pre- and post-apply warning dialogs transient to the plug also + - Remove resize grip from statusbar when embedded + * debian/patches/rename-menu-entry.patch: + - Changes 'GParted' to 'Gnome Partition Editor' + Courtesy of mdke + + -- Daniel Silverstone Thu, 9 Mar 2006 16:18:47 +0000 + +gparted (0.1-0ubuntu2) dapper; urgency=low + + * debian/patches/installer-mode.patch: + - In installer mode, watch for lines of input on stdin, as follows: + "apply" causes gparted to ask the user to apply changes, returning a + line on stdout starting with 0 if confirmed or starting with a number + other than 0 if cancelled; "undo" causes gparted to undo changes. + - If stdin is closed, then close gparted. + - Hide the Apply toolbar button in installer mode. + - When applying, don't ask for confirmation if there are no operations + to apply. (Normally this won't happen because the Apply toolbar button + will be disabled, but it can happen with stdio control.) + These changes allow Espresso to control gparted more smoothly. + + -- Colin Watson Tue, 14 Feb 2006 16:02:47 +0000 + +gparted (0.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Holbach Fri, 13 Jan 2006 10:39:50 +0100 + +gparted (0.0.9+cvs2006.01.08-0ubuntu4) dapper; urgency=low + + * Fix help output for --installer option. + + -- Colin Watson Tue, 10 Jan 2006 17:35:41 +0000 + +gparted (0.0.9+cvs2006.01.08-0ubuntu3) dapper; urgency=low + + * debian/patches/installer-mode.patch: Change --installer option to take a + window id, which the gparted interface then plugs into using GtkPlug. + Thanks to Guadalinex for the basis of this work. + + -- Colin Watson Tue, 10 Jan 2006 17:31:30 +0000 + +gparted (0.0.9+cvs2006.01.08-0ubuntu2) dapper; urgency=low + + * debian/patches/installer-mode.patch: Resurrected from old + GraphicalPartitioningTool.patch and tweaked to apply to current gparted, + with all the mount point handling removed for now as that's very + difficult to resynchronise against anything newer than 0.0.9. + + -- Colin Watson Tue, 10 Jan 2006 14:20:02 +0000 + +gparted (0.0.9+cvs2006.01.08-0ubuntu1) dapper; urgency=low + + * New CVS checkout. + * debian/control: + - bumped Build-Depends on libparted and libgtkmm. + - changed maintainer email address. + + -- Daniel Holbach Mon, 9 Jan 2006 14:55:31 +0100 + +gparted (0.0.9-0ubuntu1) dapper; urgency=low + + * New upstream release: + - gparted finally has a logo/icon ;) (thanks to Alain Clement) + see also #162092 + - minor cleanups + - correct partitiontype is now set after creation or conversion. + (#322281) (Ubuntu: #20013) + - changes already covered in our CVS checkouts. + * debian/patches/privileged.patch: + - updated. + * debian/patches/changed-menu-icon.patch, + debian/gparted.png.uuencoded: + - dropped, upstream has their own icon. + * debian/rules: + - don't install pixmaps. + * debian/control: + - don't depend on sharutils any more (uudecode). + + -- Daniel Holbach Mon, 28 Nov 2005 14:48:46 +0100 + +gparted (0.0.8+cvs2005100501-0ubuntu3) dapper; urgency=low + + * debian/patches/menu-change.patch: + - move the menu item to System/Administration (MenusRevisited). + + -- Sebastien Bacher Fri, 18 Nov 2005 16:34:00 +0100 + +gparted (0.0.8+cvs2005100501-0ubuntu2) dapper; urgency=low + + * Rebuild against new libparted. Thank you Colin Watson for the heads up. + + -- Daniel Holbach Tue, 1 Nov 2005 11:45:05 -0500 + +gparted (0.0.8+cvs2005100501-0ubuntu1) dapper; urgency=low + + * New CVS checkout. + + -- Daniel Holbach Wed, 26 Oct 2005 17:23:46 +0200 + +gparted (0.0.8+cvs2005092101-0ubuntu1) breezy; urgency=low + + * New CVS checkout: + - Added 'fi', 'vi' to ALL_LINGUAS. + - Ubuntu: #16573. + - fixes crashes with some locales. + * debian/patches/locale.patch + - dropped, got it from CVS. + * debian/patches/privileged.patch: + - updated. + * debian/patches/GraphicalPartitioningTool.patch: + - dropped, will have to be updated once we get UbuntuExpress again. + + -- Daniel Holbach Thu, 29 Sep 2005 21:48:04 +0200 + +gparted (0.0.8+cvs2005061901-0ubuntu4) breezy; urgency=low + + * debian/patches/locale.patch + - cvs fix for segfaults with some locales + + -- Charles Majola Wed, 31 Aug 2005 13:26:56 +0200 + +gparted (0.0.8+cvs2005061901-0ubuntu3) breezy; urgency=low + + * Rebuild with the new cairo version + + -- Sebastien Bacher Thu, 18 Aug 2005 17:19:43 +0000 + +gparted (0.0.8+cvs2005061901-0ubuntu2) breezy; urgency=low + + * debian/control: + - bumped gtkmm build-depends to >= 2.6.0, + - bumped Standards-Version to 3.6.2 + * debian/copyright: + - add proper GPL text. + * debian/patches/GraphicalPartitioningTool.patch: + - http://home.versanet.de/~d-elstner/gparted-installer.diff, + thanks to Daniel Elstner + - most of these changes only affect the --installer option, + - all eight points of the UDU spec GraphicalPartitioningTool have + been resolved, merely point 2 (Add a option to edit existing + partitions (add/remove mountpoints)) hits unlucky corner cases, + which has still to be fixed. + * debian/gparted.sgml + - changed the manpage accordingly + + -- Daniel Holbach Fri, 5 Aug 2005 20:18:51 +0200 + +gparted (0.0.8+cvs2005061901-0ubuntu1) breezy; urgency=low + + * new CVS checkout + - added new translation: Galician. + + -- Daniel Holbach Sun, 17 Jul 2005 22:26:55 +0200 + +gparted (0.0.8+cvs2005050201-0ubuntu1) breezy; urgency=low + + * new CVS checkout + - added new translations: French, Greek, Bulgarian, Lithuanian, + Kinyarwanda, Traditional Chinese. + * cleaned packaging. + * made sure menu entry works in Debian and Ubuntu. + + -- Daniel Holbach Thu, 09 Jun 2005 13:09:18 +0200 + +gparted (0.0.8+cvs2005022001-0ubuntu2) breezy; urgency=low + + * Rebuild for new C++ ABI + + -- Matthias Klose Tue, 7 Jun 2005 14:21:00 +0000 + +gparted (0.0.8+cvs2005022001-0ubuntu1) hoary; urgency=low + + * new CVS checkout + * added fr.po + * packaging clean up + + -- Daniel Holbach Sun, 20 Feb 2005 11:10:53 +0100 + +gparted (0.0.8+cvs2005020801-0ubuntu2) hoary; urgency=low + + * cosmetic changes in debian/ + * removed usr/sbin from debian/dirs + * changed type in the description + * cleared pixmaps/-changes in configure.in + + -- Daniel Holbach Tue, 08 Feb 2005 22:36:52 +0100 + +gparted (0.0.8+cvs2005020701-0ubuntu1) hoary; urgency=low + + * new CVS checkout + * fixed a potential infinite loop in Show_Pulsebar() (thanks to xilun) + * NMU, sponsored upload for Daniel Holbach + + -- Daniel Holbach Mon, 07 Feb 2005 08:19:24 +0100 + +gparted (0.0.8+cvs2005020501-0ubuntu1) hoary; urgency=low + + * added a menu and icons to gparted + * CVS update + * NMU, sponsored upload for Daniel Holbach + + -- Andreas Mueller Sun, 6 Feb 2005 13:25:47 +0100 + +gparted (0.0.8-1) hoary; urgency=low + + * Initial Release. + + -- Daniel Holbach Sat, 5 Feb 2005 00:30:54 +0100 + --- gparted-0.1.orig/debian/control +++ gparted-0.1/debian/control @@ -0,0 +1,19 @@ +Source: gparted +Section: gnome +Priority: optional +Maintainer: Daniel Holbach +Build-Depends: debhelper (>= 4.2.28), uuid-dev, libgtkmm-2.4-dev (>= 2.6.0), libxml-parser-perl, libglibmm-2.4-dev (>= 2.6), libparted1.6-dev (>= 1.6.25), cdbs, parted (>= 1.6.13), docbook-to-man +Standards-Version: 3.6.2 + +Package: gparted +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gksu +Recommends: jfsutils, xfsprogs, ntfsprogs, dosfstools, hfsutils, reiserfsprogs +Conflicts: espresso-frontend-gtk (<< 0.99.27) +Description: partition editor for GNOME + It is a graphical editor which uses libparted to detect and manipulate + devices and partition tables while several (optional) filesystem tools + provide support for filesystems not included in libparted. These optional + packages will be detected at runtime. + It currently supports ext2, ext3, Reiser3, FAT, NTFS, XFS, JFS, HFS and + Linux swap. --- gparted-0.1.orig/debian/gparted.sgml +++ gparted-0.1/debian/gparted.sgml @@ -0,0 +1,148 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Bart"> + Hakvoort"> + + June 9, 2005"> + + 1"> + dh@mailempfang.de"> + + GPARTED"> + + + Ubuntu"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2005 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + a graphical partitioning tool + + + + &dhpackage; + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + + &dhpackage; helps you to visually arrange your + partitions. It makes use of the libparted library to accomplish that. + Just start it from the menu. + + + + + + + + Show summary of options. + + + + + + + Specifies the X display that gparted will use. + + + + + + + NOTE: You should never have to use this, this is an option + that is provided for UbuntuExpress and does some different + assumptions. + + + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + + + --- gparted-0.1.orig/debian/compat +++ gparted-0.1/debian/compat @@ -0,0 +1 @@ +4 --- gparted-0.1.orig/debian/patches/ext3-before-ext2.patch +++ gparted-0.1/debian/patches/ext3-before-ext2.patch @@ -0,0 +1,19 @@ +diff -Nur gparted-0.1/src/GParted_Core.cc gparted-0.1.new/src/GParted_Core.cc +--- gparted-0.1/src/GParted_Core.cc 2006-01-08 15:22:59.000000000 +0000 ++++ gparted-0.1.new/src/GParted_Core.cc 2006-05-17 18:08:22.602308587 +0100 +@@ -30,12 +30,12 @@ + { + FILESYSTEMS .clear( ) ; + +- ext2 fs_ext2; +- FILESYSTEMS .push_back( fs_ext2 .get_filesystem_support( ) ) ; +- + ext3 fs_ext3; + FILESYSTEMS .push_back( fs_ext3 .get_filesystem_support( ) ) ; + ++ ext2 fs_ext2; ++ FILESYSTEMS .push_back( fs_ext2 .get_filesystem_support( ) ) ; ++ + fat16 fs_fat16; + FILESYSTEMS .push_back( fs_fat16 .get_filesystem_support( ) ) ; + --- gparted-0.1.orig/debian/patches/installer-mode.patch +++ gparted-0.1/debian/patches/installer-mode.patch @@ -0,0 +1,798 @@ +diff -Nur gparted-0.1/include/Dialog_Progress.h gparted-0.1.new/include/Dialog_Progress.h +--- gparted-0.1/include/Dialog_Progress.h 2004-11-17 13:00:25.000000000 +0000 ++++ gparted-0.1.new/include/Dialog_Progress.h 2006-05-26 23:08:48.493415543 +0100 +@@ -39,16 +39,18 @@ + Dialog_Progress( int count_operations, Glib::RefPtr textbuffer ); + ~Dialog_Progress( ); + ++ void Set_Current( const Glib::ustring& operation, int estimated_time ); + void Set_Operation( ); + +- Glib::ustring current_operation; +- int TIME_LEFT ; +- + private: + bool Show_Progress( ) ; + bool Pulse( ) { progressbar_current .pulse( ) ; return true ; } + void tglbtn_details_toggled( ) ; + ++ Glib::Mutex mutex; ++ Glib::ustring current_operation; ++ int TIME_LEFT ; ++ + Gtk::Label label_current ; + Gtk::ProgressBar progressbar_all, progressbar_current ; + Gtk::ToggleButton tglbtn_details ; +diff -Nur gparted-0.1/include/GParted_Core.h gparted-0.1.new/include/GParted_Core.h +--- gparted-0.1/include/GParted_Core.h 2006-01-05 20:08:39.000000000 +0000 ++++ gparted-0.1.new/include/GParted_Core.h 2006-05-26 23:08:48.493415543 +0100 +@@ -41,7 +41,7 @@ + class GParted_Core + { + public: +- GParted_Core( ) ; ++ GParted_Core( int installer ) ; + void find_supported_filesystems( ) ; + void get_devices( std::vector & devices ) ; + +@@ -61,7 +61,9 @@ + const FS & get_fs( GParted::FILESYSTEM filesystem ) const ; + Glib::RefPtr get_textbuffer( ) ; + std::vector get_disklabeltypes( ) ; +- ++ ++ bool installer_mode; ++ + private: + GParted::FILESYSTEM get_filesystem() ; + void set_device_partitions( Device & device ) ; +diff -Nur gparted-0.1/include/Win_GParted.h gparted-0.1.new/include/Win_GParted.h +--- gparted-0.1/include/Win_GParted.h 2006-01-08 15:22:59.000000000 +0000 ++++ gparted-0.1.new/include/Win_GParted.h 2006-05-26 23:08:48.493415543 +0100 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include //should be included by gtkmm headers. but decided to include it anyway after getting some bugreports.. + +@@ -50,7 +51,8 @@ + class Win_GParted : public Gtk::Window + { + public: +- Win_GParted( ); ++ explicit Win_GParted( int installer ); ++ ~Win_GParted(); + + private: + void init_menubar( ) ; +@@ -90,11 +92,11 @@ + + void allow_copy( bool b ) { + menu_partition .items( )[ 5 ] .set_sensitive( b ); +- toolbar_main .get_nth_item( 5 ) ->set_sensitive( b ); } ++ if ( !installer_mode ) toolbar_main .get_nth_item( 5 ) ->set_sensitive( b ); } + + void allow_paste( bool b ) { + menu_partition .items( )[ 6 ] .set_sensitive( b ); +- toolbar_main .get_nth_item( 6 ) ->set_sensitive( b ); } ++ if ( !installer_mode ) toolbar_main .get_nth_item( 6 ) ->set_sensitive( b ); } + + void allow_format( bool b ) { + menu_partition .items( )[ 8 ] .set_sensitive( b ); } +@@ -109,12 +111,16 @@ + menu_partition .items( )[ 13 ] .set_sensitive( b ); } + + void allow_undo( bool b ) { +- toolbar_main .get_nth_item( 8 ) ->set_sensitive( b ); +- ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 1 ] .get_submenu( ) ->items( ) [ 0 ] ) ->set_sensitive( b ) ; } ++ toolbutton_undo ->set_sensitive( b ); ++ if ( !installer_mode ) ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 1 ] .get_submenu( ) ->items( ) [ 0 ] ) ->set_sensitive( b ) ; } + + void allow_apply( bool b ) { +- toolbar_main .get_nth_item( 9 ) ->set_sensitive( b ); +- ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 1 ] .get_submenu( ) ->items( ) [ 1 ] ) ->set_sensitive( b ) ; } ++ if ( !installer_mode ) ++ { ++ toolbutton_apply ->set_sensitive( b ); ++ ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 1 ] .get_submenu( ) ->items( ) [ 1 ] ) ->set_sensitive( b ) ; ++ } ++ } + + //threads.. + void thread_refresh_devices() ; +@@ -153,8 +159,10 @@ + void activate_disklabel() ; + + void activate_undo( ); ++ bool activate_apply_internal( ); + void activate_apply( ); + void apply_operations_thread( ); ++ bool stdin_event( Glib::IOCondition condition ); + + //private variables + unsigned int current_device ; +@@ -182,6 +190,8 @@ + Gtk::MenuItem *menu_item; + Gtk::ProgressBar pulsebar ; + Gtk::TreeRow treerow; ++ Gtk::ToolButton *toolbutton_undo; ++ Gtk::ToolButton *toolbutton_apply; + + VBox_VisualDisk vbox_visual_disk; + TreeView_Detail treeview_detail; +@@ -240,6 +250,9 @@ + Glib::Dispatcher dispatcher; + sigc::connection conn ; + bool apply, pulse ; ++ ++ int installer_mode; ++ Gtk::Plug *plug; + }; + + } //GParted +diff -Nur gparted-0.1/src/Dialog_Progress.cc gparted-0.1.new/src/Dialog_Progress.cc +--- gparted-0.1/src/Dialog_Progress.cc 2005-12-13 21:30:13.000000000 +0000 ++++ gparted-0.1.new/src/Dialog_Progress.cc 2006-05-26 23:08:48.497415543 +0100 +@@ -70,12 +70,23 @@ + this ->get_action_area( ) ->pack_start( tglbtn_details ) ; + this ->add_button( Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL ); + +- this ->show_all_children( ) ; ++ this ->show_all_children( ) ; + scrolledwindow .hide( ) ; + } + ++void Dialog_Progress::Set_Current( const Glib::ustring& operation, int estimated_time ) ++{ ++ Glib::Mutex::Lock lock( mutex ); ++ ++ // force copy to ensure memory visibility with ref-counted strings ++ current_operation.assign( operation.begin( ), operation.end( ) ); ++ TIME_LEFT = estimated_time; ++} ++ + void Dialog_Progress::Set_Operation( ) + { ++ Glib::Mutex::Lock lock( mutex ); ++ + //all operations + if ( current_operation_number && (progressbar_all .get_fraction( ) + fraction) <= 1.0 ) + progressbar_all .set_fraction( progressbar_all .get_fraction( ) + fraction ); +@@ -85,18 +96,26 @@ + //new operation + conn .disconnect( ) ; + +- label_current .set_markup( "" + current_operation + "" ) ; +- +- progressbar_current .set_fraction( 0 ); +- progressbar_current .set_text( "initializing..." ); +- +- if ( TIME_LEFT > 0 ) ++ // close dialog after last operation ++ if ( current_operation_number > count_operations ) + { +- fraction_current = 1.00 / TIME_LEFT ; +- conn = Glib::signal_timeout( ) .connect( sigc::mem_fun( *this, &Dialog_Progress::Show_Progress ), 1000 ); ++ response( Gtk::RESPONSE_OK ); + } + else +- conn = Glib::signal_timeout( ) .connect( sigc::mem_fun( *this, &Dialog_Progress::Pulse ), 10 ); ++ { ++ label_current .set_markup( "" + current_operation + "" ) ; ++ ++ progressbar_current .set_fraction( 0 ); ++ progressbar_current .set_text( "initializing..." ); ++ ++ if ( TIME_LEFT > 0 ) ++ { ++ fraction_current = 1.00 / TIME_LEFT ; ++ conn = Glib::signal_timeout( ) .connect( sigc::mem_fun( *this, &Dialog_Progress::Show_Progress ), 1000 ); ++ } ++ else ++ conn = Glib::signal_timeout( ) .connect( sigc::mem_fun( *this, &Dialog_Progress::Pulse ), 10 ); ++ } + } + + bool Dialog_Progress::Show_Progress( ) +diff -Nur gparted-0.1/src/FileSystem.cc gparted-0.1.new/src/FileSystem.cc +--- gparted-0.1/src/FileSystem.cc 2005-12-24 23:55:54.000000000 +0000 ++++ gparted-0.1.new/src/FileSystem.cc 2006-05-26 23:08:48.497415543 +0100 +@@ -33,7 +33,9 @@ + + //stderr to stdout + //command += " 2>&1" ; ++#if 0 /* TODO: make writing junk to stdout conditional or drop it */ + std::cout << command << std::endl ; ++#endif + cmd_output = command + "\n\n" ; + dispatcher ( ) ; + +diff -Nur gparted-0.1/src/GParted_Core.cc gparted-0.1.new/src/GParted_Core.cc +--- gparted-0.1/src/GParted_Core.cc 2006-05-26 23:08:47.401415543 +0100 ++++ gparted-0.1.new/src/GParted_Core.cc 2006-05-26 23:09:33.269415543 +0100 +@@ -5,22 +5,25 @@ + namespace GParted + { + +-GParted_Core::GParted_Core( ) ++GParted_Core::GParted_Core( int installer ) + { + lp_device = NULL ; + lp_disk = NULL ; + lp_partition = NULL ; + p_filesystem = NULL ; ++ installer_mode = ( installer != 0 ); + textbuffer = Gtk::TextBuffer::create( ) ; + + //get valid flags ... + for ( PedPartitionFlag flag = ped_partition_flag_next( (PedPartitionFlag) NULL ) ; flag ; flag = ped_partition_flag_next( flag ) ) + flags .push_back( flag ) ; + ++#if 0 /* TODO: make writing junk to stdout conditional or drop it */ + //throw libpartedversion to the stdout to see which version is actually used. + std::cout << "======================" << std::endl ; + std::cout << "libparted : " << ped_get_version( ) << std::endl ; + std::cout << "======================" << std::endl ; ++#endif + + //initialize filesystemlist + find_supported_filesystems( ) ; +@@ -54,8 +57,13 @@ + linux_swap fs_linux_swap; + FILESYSTEMS .push_back( fs_linux_swap .get_filesystem_support( ) ) ; + +- reiser4 fs_reiser4; +- FILESYSTEMS .push_back( fs_reiser4 .get_filesystem_support( ) ) ; ++ if ( ! installer_mode ) { ++ /* partman doesn't support reiser4 yet, so there's no point ++ * in offering this in installer mode. ++ */ ++ reiser4 fs_reiser4; ++ FILESYSTEMS .push_back( fs_reiser4 .get_filesystem_support( ) ) ; ++ } + + reiserfs fs_reiserfs; + FILESYSTEMS .push_back( fs_reiserfs .get_filesystem_support( ) ) ; +@@ -542,8 +550,19 @@ + //however in theory, it could also screw some errorhandling. + if ( ! p_filesystem ) + return true ; +- +- return set_partition_type( new_partition ) && p_filesystem ->Create( new_partition ) ; ++ ++ if ( installer_mode ) ++ { ++ if ( set_partition_type( new_partition ) ) ++ { ++ std::cout << "- FORMAT " << new_partition .partition << " " << Utils::Get_Filesystem_String( new_partition .filesystem ) << std::endl; ++ return true ; ++ } ++ else ++ return false ; ++ } ++ else ++ return set_partition_type( new_partition ) && p_filesystem ->Create( new_partition ) ; + } + + return false ; +@@ -556,6 +575,16 @@ + + set_proper_filesystem( partition .filesystem ) ; + ++ if ( installer_mode ) ++ { ++ if ( set_partition_type( partition ) ) ++ { ++ std::cout << "- FORMAT " << partition .partition << " " << Utils::Get_Filesystem_String( partition .filesystem ) << std::endl; ++ return true; ++ } ++ else ++ return false; ++ } + return set_partition_type( partition ) && p_filesystem ->Create( partition ) ; + } + +diff -Nur gparted-0.1/src/Win_GParted.cc gparted-0.1.new/src/Win_GParted.cc +--- gparted-0.1/src/Win_GParted.cc 2006-01-08 15:23:00.000000000 +0000 ++++ gparted-0.1.new/src/Win_GParted.cc 2006-05-26 23:08:48.501415543 +0100 +@@ -22,36 +22,55 @@ + #include + #include + ++#define TRANSIENT_TARGET (*((installer_mode)?((Gtk::Window*)(this ->plug)):((Gtk::Window*)this))) ++ + namespace GParted + { + +-Win_GParted::Win_GParted( ) ++Win_GParted::Win_GParted( int installer ) : gparted_core( installer ) + { ++ installer_mode = installer; ++ + copied_partition .Reset( ) ; + selected_partition .Reset( ) ; + new_count = 1; + current_device = 0 ; + pulse = false ; + +- //==== GUI ========================= +- this ->set_title( _("GParted") ); +- this ->set_default_size( 775, 500 ); +- +- try ++ if ( !installer_mode ) + { +- this ->set_icon_from_file( GNOME_ICONDIR "/gparted.png" ) ; ++ plug = 0; ++ ++ //==== GUI ========================= ++ this ->set_title( ( installer_mode ) ? _("Advanced Partitioning") : _("GParted") ); ++ this ->set_default_size( 775, 500 ); ++ ++ try ++ { ++ this ->set_icon_from_file( GNOME_ICONDIR "/gparted.png" ) ; ++ } ++ catch ( Glib::Exception & e ) ++ { ++ std::cout << e .what() << std::endl ; ++ } ++ ++ //Pack the main box ++ this ->add( vbox_main ); ++ ++ //menubar.... ++ init_menubar( ) ; ++ vbox_main .pack_start( menubar_main, Gtk::PACK_SHRINK ); ++ } ++ else { ++ plug = new Gtk::Plug( (GdkNativeWindow) installer_mode ); ++ plug ->add( vbox_main ); ++ vbox_main .show( ); ++ plug ->show( ); ++ this ->hide_all( ); ++ this ->move( 100000, 100000 ); ++ init_partition_menu( ); ++ Glib::signal_io().connect( sigc::mem_fun( this, &Win_GParted::stdin_event ), Glib::IOChannel::create_from_fd( 0 ), Glib::IO_IN | Glib::IO_HUP ); + } +- catch ( Glib::Exception & e ) +- { +- std::cout << e .what() << std::endl ; +- } +- +- //Pack the main box +- this ->add( vbox_main ); +- +- //menubar.... +- init_menubar( ) ; +- vbox_main .pack_start( menubar_main, Gtk::PACK_SHRINK ); + + //toolbar.... + init_toolbar( ) ; +@@ -82,7 +101,14 @@ + statusbar .add( pulsebar ); + vbox_main .pack_start( statusbar, Gtk::PACK_SHRINK ); + +- this ->show_all_children( ); ++ if ( installer_mode ) ++ { ++ statusbar .set_has_resize_grip( false ); ++ plug ->show_all_children( ); ++ this ->hide_all( ); ++ } ++ else ++ this ->show_all_children( ); + + //make sure harddisk information and operationlist are closed.. + hpaned_main .get_child1( ) ->hide( ) ; +@@ -143,6 +169,7 @@ + toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::NEW)); + toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_new) ); toolbar_main.append(*toolbutton); + toolbutton ->set_tooltip(tooltips, _("Create a new partition in the selected unallocated space") ); ++ toolbutton ->set_is_important(); + toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::DELETE)); + toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_delete) ); toolbar_main.append(*toolbutton); + toolbutton ->set_tooltip(tooltips, _("Delete the selected partition") ); +@@ -155,22 +182,34 @@ + toolbutton ->set_tooltip(tooltips, _("Resize/Move the selected partition") ); + toolbar_main.append( *(Gtk::manage(new Gtk::SeparatorToolItem)) ); + +- //COPY and PASTE +- toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::COPY)); +- toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_copy) ); toolbar_main.append(*toolbutton); +- toolbutton ->set_tooltip(tooltips, _("Copy the selected partition to the clipboard") ); +- toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::PASTE)); +- toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_paste) ); toolbar_main.append(*toolbutton); +- toolbutton ->set_tooltip(tooltips, _("Paste the partition from the clipboard") ); +- toolbar_main.append( *(Gtk::manage(new Gtk::SeparatorToolItem)) ); ++ if ( !installer_mode ) ++ { ++ //COPY and PASTE ++ toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::COPY)); ++ toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_copy) ); ++ toolbar_main.append(*toolbutton); ++ toolbutton ->set_tooltip(tooltips, _("Copy the selected partition to the clipboard") ); ++ ++ toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::PASTE)); ++ toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_paste) ); ++ toolbar_main.append(*toolbutton); ++ toolbutton ->set_tooltip(tooltips, _("Paste the partition from the clipboard") ); ++ ++ toolbar_main.append( *(Gtk::manage(new Gtk::SeparatorToolItem)) ); ++ } + + //UNDO and APPLY +- toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::UNDO)); +- toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_undo) ); toolbar_main.append(*toolbutton); toolbutton ->set_sensitive( false ); +- toolbutton ->set_tooltip(tooltips, _("Undo last operation") ); +- toolbutton = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::APPLY)); +- toolbutton ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_apply) ); toolbar_main.append(*toolbutton); toolbutton ->set_sensitive( false ); +- toolbutton ->set_tooltip(tooltips, _("Apply all operations") ); ++ toolbutton_undo = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::UNDO)); ++ toolbutton_undo ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_undo) ); toolbar_main.append(*toolbutton_undo); toolbutton_undo ->set_sensitive( false ); ++ toolbutton_undo ->set_tooltip(tooltips, _("Undo last operation") ); ++ ++ if ( !installer_mode ) ++ { ++ toolbutton_apply = Gtk::manage(new Gtk::ToolButton(Gtk::Stock::APPLY)); ++ ++ toolbutton_apply ->signal_clicked().connect( sigc::mem_fun(*this, &Win_GParted::activate_apply) ); toolbar_main.append(*toolbutton_apply); toolbutton_apply ->set_sensitive( false ); ++ toolbutton_apply ->set_tooltip(tooltips, _("Apply all operations") ); ++ } + + //initialize and pack combo_devices + liststore_devices = Gtk::ListStore::create( treeview_devices_columns ) ; +@@ -183,6 +222,9 @@ + combo_devices .signal_changed() .connect( sigc::mem_fun(*this, &Win_GParted::combo_devices_changed) ); + + hbox_toolbar .pack_start( combo_devices, Gtk::PACK_SHRINK ) ; ++ ++ if( installer_mode ) ++ toolbar_main .set_toolbar_style( Gtk::TOOLBAR_BOTH_HORIZ ); + } + + void Win_GParted::init_partition_menu( ) +@@ -216,15 +258,18 @@ + + menu_partition .items() .push_back( Gtk::Menu_Helpers::SeparatorElem() ); + +- image = manage( new Gtk::Image( Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU ) ); +- /*TO TRANSLATORS: menuitem which holds a submenu with filesystems.. */ +- menu_partition .items() .push_back( +- Gtk::Menu_Helpers::ImageMenuElem( _("_Format to"), +- *image, +- * create_format_menu() ) ) ; +- +- menu_partition .items() .push_back( Gtk::Menu_Helpers::SeparatorElem() ); +- ++ if ( !installer_mode ) ++ { ++ image = manage( new Gtk::Image( Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU ) ); ++ /*TO TRANSLATORS: menuitem which holds a submenu with filesystems.. */ ++ menu_partition .items() .push_back( ++ Gtk::Menu_Helpers::ImageMenuElem( _("_Format to"), ++ *image, ++ * create_format_menu() ) ) ; ++ ++ menu_partition .items() .push_back( Gtk::Menu_Helpers::SeparatorElem() ); ++ } ++ + menu_partition .items() .push_back( + Gtk::Menu_Helpers::MenuElem( _("Unmount"), + sigc::mem_fun( *this, &Win_GParted::activate_unmount ) ) ); +@@ -432,7 +477,8 @@ + + //disable all input stuff + toolbar_main .set_sensitive( false ) ; +- menubar_main .set_sensitive( false ) ; ++ if ( !installer_mode ) ++ menubar_main .set_sensitive( false ) ; + combo_devices .set_sensitive( false ) ; + menu_partition .set_sensitive( false ) ; + treeview_detail .set_sensitive( false ) ; +@@ -456,7 +502,8 @@ + + //enable all disabled stuff + toolbar_main .set_sensitive( true ) ; +- menubar_main .set_sensitive( true ) ; ++ if ( !installer_mode ) ++ menubar_main .set_sensitive( true ) ; + combo_devices .set_sensitive( true ) ; + menu_partition .set_sensitive( true ) ; + treeview_detail .set_sensitive( true ) ; +@@ -490,7 +537,10 @@ + + bool Win_GParted::on_delete_event( GdkEventAny *event ) + { +- return ! Quit_Check_Operations( ); ++ bool quit_check_result = Quit_Check_Operations( ); ++ if ( quit_check_result ) ++ Gtk::Main::quit( ); ++ return ! quit_check_result; + } + + void Win_GParted::Add_Operation( OperationType operationtype, const Partition & new_partition) +@@ -712,7 +762,8 @@ + Gtk::Main::iteration( ); + } + +- ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 2 ] .get_submenu( ) ->items( ) [ 1 ] ) ->set_active( true ) ; ++ if ( !installer_mode ) ++ ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 2 ] .get_submenu( ) ->items( ) [ 1 ] ) ->set_active( true ) ; + } + + void Win_GParted::close_operationslist( ) +@@ -727,7 +778,8 @@ + } + + hbox_operations .hide( ) ; +- ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 2 ] .get_submenu( ) ->items() [ 1 ] ) ->set_active( false ) ; ++ if ( !installer_mode ) ++ ( (Gtk::CheckMenuItem *) & menubar_main .items( ) [ 2 ] .get_submenu( ) ->items() [ 1 ] ) ->set_active( false ) ; + } + + void Win_GParted::clear_operationslist( ) +@@ -804,10 +856,13 @@ + { + combo_devices .hide() ; + +- menubar_main .items()[ 1 ] .set_sensitive( false ) ; +- menubar_main .items()[ 2 ] .set_sensitive( false ) ; +- menubar_main .items()[ 3 ] .set_sensitive( false ) ; +- menubar_main .items()[ 4 ] .set_sensitive( false ) ; ++ if ( !installer_mode ) ++ { ++ menubar_main .items()[ 1 ] .set_sensitive( false ) ; ++ menubar_main .items()[ 2 ] .set_sensitive( false ) ; ++ menubar_main .items()[ 3 ] .set_sensitive( false ) ; ++ menubar_main .items()[ 4 ] .set_sensitive( false ) ; ++ } + toolbar_main .set_sensitive( false ) ; + vbox_visual_disk .set_sensitive( false ) ; + treeview_detail .set_sensitive( false ) ; +@@ -830,10 +885,13 @@ + { + combo_devices .show() ; + +- menubar_main .items()[ 1 ] .set_sensitive( true ) ; +- menubar_main .items()[ 2 ] .set_sensitive( true ) ; +- menubar_main .items()[ 3 ] .set_sensitive( true ) ; +- menubar_main .items()[ 4 ] .set_sensitive( true ) ; ++ if ( !installer_mode ) ++ { ++ menubar_main .items()[ 1 ] .set_sensitive( true ) ; ++ menubar_main .items()[ 2 ] .set_sensitive( true ) ; ++ menubar_main .items()[ 3 ] .set_sensitive( true ) ; ++ menubar_main .items()[ 4 ] .set_sensitive( true ) ; ++ } + + toolbar_main .set_sensitive( true ) ; + vbox_visual_disk .set_sensitive( true ) ; +@@ -846,7 +904,7 @@ + void Win_GParted::menu_gparted_filesystems( ) + { + Dialog_Filesystems dialog ; +- dialog .set_transient_for( *this ) ; ++ dialog .set_transient_for( TRANSIENT_TARGET ) ; + + dialog .Load_Filesystems( gparted_core .get_filesystems() ) ; + while ( dialog .run() == Gtk::RESPONSE_OK ) +@@ -864,7 +922,7 @@ + void Win_GParted::menu_gparted_quit( ) + { + if ( Quit_Check_Operations( ) ) +- this ->hide( ); ++ Gtk::Main::quit( ); + } + + void Win_GParted::menu_view_harddisk_info( ) +@@ -914,7 +972,7 @@ + std::vector strings ; + + Gtk::AboutDialog dialog ; +- dialog .set_transient_for( *this ) ; ++ dialog .set_transient_for( TRANSIENT_TARGET ) ; + + dialog .set_name( _("GParted") ) ; + dialog .set_logo( this ->get_icon( ) ) ; +@@ -1031,7 +1089,7 @@ + else + dialog .Set_Data( selected_partition, partitions ); + +- dialog .set_transient_for( *this ) ; ++ dialog .set_transient_for( TRANSIENT_TARGET ) ; + + if ( dialog .run( ) == Gtk::RESPONSE_OK ) + { +@@ -1071,7 +1129,7 @@ + Dialog_Partition_Copy dialog( gparted_core .get_fs( copied_partition .filesystem ), devices[ current_device ] .cylsize ) ; + copied_partition .error .clear( ) ; //we don't need the errors of the source partition. + dialog .Set_Data( selected_partition, copied_partition ) ; +- dialog .set_transient_for( *this ); ++ dialog .set_transient_for( TRANSIENT_TARGET ); + + if ( dialog .run( ) == Gtk::RESPONSE_OK ) + { +@@ -1092,7 +1150,7 @@ + Dialog_Partition_New dialog; + + dialog .Set_Data( selected_partition, any_extended, new_count, gparted_core .get_filesystems( ), devices[ current_device ] .readonly, devices[ current_device ] .cylsize ) ; +- dialog .set_transient_for( *this ); ++ dialog .set_transient_for( TRANSIENT_TARGET ); + + if ( dialog .run( ) == Gtk::RESPONSE_OK ) + { +@@ -1185,7 +1243,7 @@ + void Win_GParted::activate_info( ) + { + Dialog_Partition_Info dialog( selected_partition ); +- dialog .set_transient_for( *this ); ++ dialog .set_transient_for( TRANSIENT_TARGET ); + dialog .run(); + } + +@@ -1322,7 +1380,7 @@ + void Win_GParted::activate_disklabel( ) + { + Dialog_Disklabel dialog( devices[ current_device ] .path, gparted_core .get_disklabeltypes( ) ) ; +- dialog .set_transient_for( *this ); ++ dialog .set_transient_for( TRANSIENT_TARGET ); + + if ( dialog .run( ) == Gtk::RESPONSE_OK ) + { +@@ -1358,20 +1416,24 @@ + close_operationslist( ) ; + } + +-void Win_GParted::activate_apply( ) ++bool Win_GParted::activate_apply_internal( ) + { ++ if ( ! operations .size( ) ) ++ return true; ++ + str_temp = "" ; + str_temp += _( "Are you sure you want to apply the pending operations?" ) ; + str_temp += "\n\n" ; + str_temp += _( "It is recommended to backup valuable data before proceeding.") ; + +- Gtk::MessageDialog dialog( *this, str_temp, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true ); ++ Gtk::MessageDialog dialog( TRANSIENT_TARGET, str_temp, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true ); + dialog .set_title( _( "Apply operations to harddisk" ) ); + + dialog .add_button( Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL ); + dialog .add_button( Gtk::Stock::APPLY, Gtk::RESPONSE_OK ); + +- dialog .show_all_children( ) ; ++ dialog .show_all_children( ) ; ++ + if ( dialog.run( ) == Gtk::RESPONSE_OK ) + { + dialog .hide( ) ; //hide confirmationdialog +@@ -1383,7 +1445,8 @@ + + thread = Glib::Thread::create( SigC::slot_class( *this, &Win_GParted::apply_operations_thread ), true ); + +- dialog_progress ->set_transient_for( *this ); ++ dialog_progress ->set_transient_for( TRANSIENT_TARGET ); ++ + while ( dialog_progress ->run( ) != Gtk::RESPONSE_OK ) + apply = false ;//finish current operation . then stop applying operations + +@@ -1411,6 +1474,7 @@ + str_temp += _("Because making changes to a busy device may confuse the kernel, you are advised to reboot your computer.") ; + + Gtk::MessageDialog dialog( *this, str_temp, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true ); ++ dialog .set_transient_for( TRANSIENT_TARGET ); + dialog .run( ) ; + } + +@@ -1424,22 +1488,55 @@ + + //reread devices and their layouts... + menu_gparted_refresh_devices( ) ; ++ ++ return true; + } ++ else ++ return false; ++} ++ ++void Win_GParted::activate_apply( ) ++{ ++ activate_apply_internal( ) ; + } + + void Win_GParted::apply_operations_thread( ) + { + for ( unsigned int t = 0 ; t < operations .size( ) && apply ; t++ ) + { +- dialog_progress ->current_operation = operations[ t ] .str_operation ; +- dialog_progress ->TIME_LEFT = gparted_core .get_estimated_time( operations[ t ] ) ; ++ dialog_progress ->Set_Current( operations[ t ] .str_operation, ++ gparted_core .get_estimated_time( operations[ t ] ) ); + dispatcher( ) ; + + gparted_core .Apply_Operation_To_Disk( operations[ t ] ); + } +- +- dialog_progress ->response( Gtk::RESPONSE_OK ); ++ dispatcher( ); ++} ++ ++bool Win_GParted::stdin_event( Glib::IOCondition condition ) ++{ ++ if ( condition & Glib::IO_IN ) ++ { ++ char line[512]; ++ std::cin.getline( line, 512 ) ; ++ if ( strcmp( line, "apply" ) == 0 ) ++ { ++ if ( activate_apply_internal( ) ) ++ std::cout << "0 OK" << std::endl ; ++ else ++ std::cout << "1 Cancel" << std::endl ; ++ } ++ else if ( strcmp( line, "undo" ) == 0 ) ++ activate_undo( ) ; ++ } ++ ++ if ( condition & Glib::IO_HUP ) ++ Gtk::Main::quit( ); + } + ++Win_GParted::~Win_GParted( ) ++{ ++ delete plug; ++} + + } // GParted +diff -Nur gparted-0.1/src/main.cc gparted-0.1.new/src/main.cc +--- gparted-0.1/src/main.cc 2005-09-13 15:56:00.000000000 +0100 ++++ gparted-0.1.new/src/main.cc 2006-05-26 23:08:48.505415543 +0100 +@@ -20,16 +20,29 @@ + + int main( int argc, char *argv[ ] ) + { ++ int installer_mode = false; ++ + //initialize thread system + Glib::thread_init( ); +- +- Gtk::Main kit( argc, argv ); + + //i18n + bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR ); + bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" ); + textdomain( GETTEXT_PACKAGE ); + ++ Glib::OptionEntry entry; ++ entry.set_long_name( "installer" ); ++ entry.set_description( "Run in installer mode" ); ++ entry.set_arg_description( "WID" ); ++ ++ Glib::OptionGroup options( "", "" ); ++ options.add_entry( entry, installer_mode ); ++ ++ Glib::OptionContext context; ++ context.set_main_group( options ); ++ ++ Gtk::Main kit( argc, argv, context ); ++ + //check UID + if ( getuid( ) != 0 ) + { +@@ -38,8 +51,10 @@ + exit( 0 ); + } + +- GParted::Win_GParted win_gparted; +- Gtk::Main::run( win_gparted ); ++ GParted::Win_GParted win_gparted( installer_mode ); ++ if ( !installer_mode ) ++ win_gparted .show( ); ++ Gtk::Main::run( ); + + return 0; + } --- gparted-0.1.orig/debian/patches/upstream-ntfsresize-fixes.patch +++ gparted-0.1/debian/patches/upstream-ntfsresize-fixes.patch @@ -0,0 +1,32 @@ +diff -Nur gparted-0.1/src/ntfs.cc gparted-0.1.new/src/ntfs.cc +--- gparted-0.1/src/ntfs.cc 2005-12-28 16:43:06.000000000 +0000 ++++ gparted-0.1.new/src/ntfs.cc 2006-05-23 11:27:57.594308587 +0100 +@@ -84,12 +84,15 @@ + + bool ntfs::Resize( const Partition & partition_new, bool fill_partition ) + { +- Glib::ustring str_temp = "echo y | ntfsresize -f " + partition_new .partition ; ++ Glib::ustring str_temp = "ntfsresize --force --force " + partition_new .partition ; + + if ( ! fill_partition ) + str_temp += " -s " + Utils::num_to_str( partition_new .Get_Length_MB( ) - cylinder_size, true ) + "M" ; + +- return ! Execute_Command( str_temp ) ; ++ if ( ! Execute_Command( str_temp + " --no-action" ) ) ++ return ! Execute_Command( str_temp ); ++ else ++ return false; + } + + bool ntfs::Copy( const Glib::ustring & src_part_path, const Glib::ustring & dest_part_path ) +@@ -106,9 +114,7 @@ + + bool ntfs::Check_Repair( const Partition & partition ) + { +- //according to Szaka it's best to use ntfsresize to check the partition for errors +- //since --info is read-only i'll leave it out. just calling ntfsresize --force has also a tendency of fixing stuff :) +- return Resize( partition, true ) ; ++ return ! Execute_Command( "ntfsresize -i -f -v " + partition .partition ); + } + + int ntfs::get_estimated_time( long MB_to_Consider ) --- gparted-0.1.orig/debian/patches/menu-change.patch +++ gparted-0.1/debian/patches/menu-change.patch @@ -0,0 +1,11 @@ +diff -Nur gparted-0.1/gparted.desktop.in gparted-0.1.new/gparted.desktop.in +--- gparted-0.1/gparted.desktop.in 2005-11-25 15:53:22.000000000 +0100 ++++ gparted-0.1.new/gparted.desktop.in 2006-03-20 19:58:36.000000000 +0100 +@@ -6,5 +6,6 @@ + Icon=gparted.png + Terminal=false + Type=Application +-Categories=GNOME;Application;System; ++Categories=GNOME;Application;System;Settings; + StartupNotify=true ++X-KDE-SubstituteUID=true --- gparted-0.1.orig/debian/patches/privileged.patch +++ gparted-0.1/debian/patches/privileged.patch @@ -0,0 +1,12 @@ +diff -Nur gparted-0.0.9/gparted.desktop.in gparted-0.0.9.new/gparted.desktop.in +--- gparted-0.0.9/gparted.desktop.in 2005-11-28 14:58:50.000000000 +0100 ++++ gparted-0.0.9.new/gparted.desktop.in 2005-11-28 14:59:07.000000000 +0100 +@@ -2,7 +2,7 @@ + Encoding=UTF-8 + _Name=GParted + _Comment=Gnome Partition Editor +-Exec=gparted ++Exec=gksu gparted + Icon=gparted.png + Terminal=false + Type=Application --- gparted-0.1.orig/debian/patches/rename-menu-entry.patch +++ gparted-0.1/debian/patches/rename-menu-entry.patch @@ -0,0 +1,11 @@ +diff -ur gparted-0.1/gparted.desktop.in gparted-matt/gparted.desktop.in +--- gparted-0.1/gparted.desktop.in 2005-11-25 14:53:22.000000000 +0000 ++++ gparted-matt/gparted.desktop.in 2006-03-09 12:15:13.000000000 +0000 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-_Name=GParted ++_Name=Gnome Partition Editor + _Comment=Gnome Partition Editor + Exec=gparted + Icon=gparted.png