diff -u gparted-0.4.3/debian/watch gparted-0.4.5/debian/watch --- gparted-0.4.3/debian/watch +++ gparted-0.4.5/debian/watch @@ -2,2 +2 @@ -http://sf.net/gparted/gparted-(.+)\.tar\.gz - +http://sf.net/gparted/gparted-(.+)\.tar\.bz2 diff -u gparted-0.4.3/debian/control gparted-0.4.5/debian/control --- gparted-0.4.3/debian/control +++ gparted-0.4.5/debian/control @@ -6,26 +6,27 @@ Uploaders: Alan Baghumian , Otavio Salvador -Build-Depends: quilt, - debhelper (>= 5), +Build-Depends: quilt, + debhelper (>= 7), libxml-parser-perl, uuid-dev, - parted, + parted, pkg-config, gnome-doc-utils, rarian-compat, libgtkmm-2.4-dev, libparted1.8-dev, intltool -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://gparted.sourceforge.net Package: gparted Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - hal, + ${misc:Depends}, + hal, gksu -Suggests: xfsprogs, reiserfsprogs, reiser4progs, jfsutils, ntfsprogs +Recommends: yelp, kpartx, dmraid, dmsetup +Suggests: xfsprogs, reiserfsprogs, reiser4progs, jfsutils, ntfsprogs, dosfstools Description: GNOME partition editor GParted uses libparted to detect and manipulate devices and partition - tables while several (optional) filesystem tools provide support for + tables while several (optional) filesystem tools provide support for filesystems not included in libparted. diff -u gparted-0.4.3/debian/copyright gparted-0.4.5/debian/copyright --- gparted-0.4.3/debian/copyright +++ gparted-0.4.5/debian/copyright @@ -26,3 +26,3 @@ On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. diff -u gparted-0.4.3/debian/changelog gparted-0.4.5/debian/changelog --- gparted-0.4.3/debian/changelog +++ gparted-0.4.5/debian/changelog @@ -1,3 +1,44 @@ +gparted (0.4.5-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #383628), remaining changes: + - Go back to using gksu rather than su-to-root (since menu isn't + in Ubuntu main) + + debian/control + + debian/patches/01_fix-desktop.patch + * Mention application name in the menu entry (LP: #383612) + - debian/patches/01_fix-desktop.patch + + -- Felix Geyer Thu, 04 Jun 2009 16:58:06 +0200 + +gparted (0.4.5-1) unstable; urgency=low + + * New upstream release + + -- Anibal Monsalve Salazar Thu, 21 May 2009 22:01:15 +1000 + +gparted (0.4.4-1) unstable; urgency=low + + * New upstream release + * Drop 10_dev_mapper.patch as upstream bug 556114 was closed; see: + http://bugzilla.gnome.org/show_bug.cgi?id=556114 + http://bugzilla.gnome.org/show_bug.cgi?id=317262#c36 + http://gparted-forum.surf4.info/viewtopic.php?pid=19714 + * Recommends kpartx, dmraid and dmsetup + * Suggests dosfstools; closes: #505568 + + -- Anibal Monsalve Salazar Sun, 19 Apr 2009 20:44:24 +1000 + +gparted (0.4.3-1) unstable; urgency=low + + * Merge 0.4.3-0ubuntu1 + * Standards version is 3.8.1 + * debhelper compat is 7 + * Use dh_prep instead of dh_clean -k + * Remove dependency on menu; closes: #519860 + * Recommends yelp; closes: #502077 + + -- Anibal Monsalve Salazar Wed, 18 Mar 2009 10:36:55 +1100 + gparted (0.4.3-0ubuntu1) jaunty; urgency=low [ Surfaz Gemon Meme, Colin Watson ] @@ -28,6 +69,26 @@ -- Surfaz Gemon Meme Tue, 24 Feb 2009 13:16:44 +0000 +gparted (0.4.1-2) unstable; urgency=low + + * Fix the following lintian issues: + W: gparted source: debian-watch-file-should-use-sf-redirector line 2 + W: gparted: copyright-refers-to-versionless-license-file + usr/share/common-licenses/GPL + + -- Anibal Monsalve Salazar Mon, 16 Feb 2009 11:15:35 +1100 + +gparted (0.4.1-1) experimental; urgency=low + + * New upstream stable release + - drop 05_GParted_Core.cc.diff, merged upstream + - refreshed 01_fix-desktop.patch to be applied correctly + * Updated debian/control: + - bump standards version to 3.8.0.1, no extra change is needed + - added intltool to build-deps + + -- Alan Baghumian Mon, 15 Dec 2008 20:21:35 -0800 + gparted (0.3.9-3ubuntu1) jaunty; urgency=low [ Pedro Fragoso ] diff -u gparted-0.4.3/debian/rules gparted-0.4.5/debian/rules --- gparted-0.4.3/debian/rules +++ gparted-0.4.5/debian/rules @@ -35,7 +35,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/gparted diff -u gparted-0.4.3/debian/compat gparted-0.4.5/debian/compat --- gparted-0.4.3/debian/compat +++ gparted-0.4.5/debian/compat @@ -1 +1 @@ -4 +7 reverted: --- gparted-0.4.3/debian/patches/10_dev_mapper.patch +++ gparted-0.4.3.orig/debian/patches/10_dev_mapper.patch @@ -1,61 +0,0 @@ -# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gparted/+bug/271796 -# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=556114 -# Description: find /dev/mapper devices when not using libparted for device -# discovery -# -Index: b/src/GParted_Core.cc -=================================================================== ---- a/src/GParted_Core.cc -+++ b/src/GParted_Core.cc -@@ -187,6 +187,51 @@ - } - } - proc_partitions .close() ; -+ -+ std::set dm_majors; -+ std::ifstream proc_devices( "/proc/devices" ) ; -+ if ( proc_devices ) -+ { -+ //parse device numbers from /proc/devices -+ std::string line ; -+ bool seen_bd = false ; -+ while ( getline( proc_devices, line ) ) -+ { -+ if ( ! seen_bd ) -+ { -+ if ( ! line .compare( 0, 14, "Block devices:" ) == 0 ) -+ seen_bd = true ; -+ continue ; -+ } -+ unsigned int major ; -+ char c_str[256+1] ; -+ if ( sscanf( line .c_str(), "%u %256s", &major, c_str ) == 2 ) -+ dm_majors .insert( major ); -+ } -+ proc_devices .close() ; -+ } -+ -+ DIR *mapper_dir = opendir( "/dev/mapper" ); -+ if ( mapper_dir ) -+ { -+ struct dirent *mapper_entry ; -+ while ( (mapper_entry = readdir( mapper_dir )) ) -+ { -+ if ( strcmp( mapper_entry ->d_name, "." ) == 0 || -+ strcmp( mapper_entry ->d_name, ".." ) == 0 || -+ strcmp( mapper_entry ->d_name, "control" ) == 0 ) -+ continue ; -+ std::string mapper_name = "/dev/mapper/" ; -+ mapper_name += mapper_entry ->d_name ; -+ struct stat st ; -+ if ( stat( mapper_name .c_str(), &st ) != 0 ) -+ continue; -+ if ( dm_majors .find( major( st.st_rdev ) ) != dm_majors .end() ) -+ //TODO avoid probing partition nodes for dmraid devices -+ ped_device_get( mapper_name .c_str() ) ; -+ } -+ closedir( mapper_dir ) ; -+ } - } - else - { diff -u gparted-0.4.3/debian/patches/series gparted-0.4.5/debian/patches/series --- gparted-0.4.3/debian/patches/series +++ gparted-0.4.5/debian/patches/series @@ -2 +1,0 @@ -10_dev_mapper.patch diff -u gparted-0.4.3/debian/patches/01_fix-desktop.patch gparted-0.4.5/debian/patches/01_fix-desktop.patch --- gparted-0.4.3/debian/patches/01_fix-desktop.patch +++ gparted-0.4.5/debian/patches/01_fix-desktop.patch @@ -1,9 +1,10 @@ --- a/gparted.desktop.in.in +++ b/gparted.desktop.in.in -@@ -1,9 +1,10 @@ +@@ -1,9 +1,11 @@ [Desktop Entry] -_Name=GParted Partition Editor -+_Name=Partition Editor ++_Name=GParted ++GenericName=Partition Editor _Comment=Create, reorganize, and delete partitions -Exec=@gksuprog@ @installdir@/gparted %f +Exec=gksu /usr/sbin/gparted