Source: gparted
Version: 0.30.0-3
Tags: patch
I'm attaching several patches for the gparted packaging in this email
(and the next). I mentioned some of these fixes at
https://launchpad.net/bugs/1735833
Thanks,
Jeremy Bicha
From 69a156c832a0c92f65ecb2cafc32b4e2cdbfc0c4 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:35:12 -0500
Subject: [PATCH 1/8] Fix debian/watch
---
debian/watch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/watch b/debian/watch
index b4410b6..5448bdb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/gparted/gparted-(.+)\.tar\.gz|bz2|xz
+https://sf.net/gparted/gparted-([\d\.]+)\.tar\.gz|bz2|xz
--
2.14.1
From 1a8544655a84d0b1f0568e945fea75574fad544a Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:36:18 -0500
Subject: [PATCH 2/8] Build-Depend on policykit-1 to install PolicyKit policy
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 30f0436..de57282 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Phillip Susi <ps...@ubuntu.com>
Uploaders: Anibal Monsalve Salazar <ani...@debian.org>
Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 10), libxml-parser-perl,
- uuid-dev, parted, pkg-config, gnome-doc-utils, rarian-compat,
+ uuid-dev, parted, pkg-config, policykit-1, gnome-doc-utils, rarian-compat,
libgtkmm-2.4-dev, libparted0-dev (>= 2.2), intltool, gnome-pkg-tools
Standards-Version: 3.9.6
Homepage: http://gparted.sourceforge.net
--
2.14.1
From 74932d79159f4c3bb085ab9ef589b131f028cb31 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:37:10 -0500
Subject: [PATCH 3/8] Drop unnecessary help directory override
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 2690db4..0458d99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_autoreconf:
dh_autoreconf --as-needed
override_dh_auto_configure:
- dh_auto_configure -- --enable-libparted-dmraid --enable-online-resize --enable-xhost-root --with-help-dir=\$${prefix}/share/gnome/help
+ dh_auto_configure -- --enable-libparted-dmraid --enable-online-resize --enable-xhost-root
override_dh_install:
dh_install
--
2.14.1
From ecbd458ca277feee90de7959e30edef6da7dcc69 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:38:47 -0500
Subject: [PATCH 4/8] Install binaries to /usr/sbin/
I had trouble running gparted on Ubuntu without this.
It also matches the behavior in previous gparted versions.
---
debian/rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 0458d99..8b33fcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,8 @@ override_dh_autoreconf:
dh_autoreconf --as-needed
override_dh_auto_configure:
- dh_auto_configure -- --enable-libparted-dmraid --enable-online-resize --enable-xhost-root
+ dh_auto_configure -- --enable-libparted-dmraid --enable-online-resize --enable-xhost-root \
+ --bindir=\$${prefix}/sbin
override_dh_install:
dh_install
--
2.14.1
From 36372528ba094d03c2f396b37cef91ab2efd8bec Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:40:17 -0500
Subject: [PATCH 5/8] Drop unnecessary call to dh_translations
---
debian/rules | 2 --
1 file changed, 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 8b33fcf..641f073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,3 @@ override_dh_auto_configure:
override_dh_install:
dh_install
rm -fr $(CURDIR)/debian/gparted/var
- if dh -l | grep translations ; then dh_translations ; fi
-
--
2.14.1
From 6e67e5356bf5e7babaadfb72bee538df43f5681f Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:41:17 -0500
Subject: [PATCH 6/8] Suggest udftools
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index de57282..07c8045 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: udisks2 (<< 2.1.5)
Suggests: xfsprogs, reiserfsprogs, reiser4progs, jfsutils, ntfs-3g,
- dosfstools, mtools, yelp, kpartx, dmraid, dmsetup, gpart
+ dosfstools, mtools, yelp, kpartx, dmraid, dmsetup, gpart, udftools
Description: GNOME partition editor
GParted uses libparted to detect and manipulate devices and partition
tables while several (optional) filesystem tools provide support for
--
2.14.1
From 4e8d54439a5c2e8c9f03a88e54d1bed3a2262d1e Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Fri, 8 Dec 2017 19:46:13 -0500
Subject: [PATCH 7/8] Convert debian/copyright to 1.0 format
---
debian/copyright | 81 ++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 26 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 942b47a..a89a414 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,27 +1,56 @@
-This package was debianized by David Moreno Garza <da...@damog.net> on
-Sat, 26 Feb 2005 19:12:46 -0600.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gparted
+Source: http://gparted.org
+
+Files: *
+Copyright: 2004-2006 Bart Hakvoort
+ 2008-2017 Curtis Gedak
+ 2011-2017 Mike Fleetwood
+License: GPL-2+
+ 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 program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: lib/gtest/*
+Copyright: 2003, 2005-2009, 2015 Google Inc.
+License: BSD-3-clause-Google
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-It was downloaded from http://gparted.sourceforge.net/
-
-Upstream Author: Bart Hakvoort <b...@hakvoort.be>
-
-Copyright: 2004-2006 Bart Hakvoort <b...@hakvoort.be>
-
-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; version 2 dated June, 1991.
-
- 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
--
2.14.1
