Control: tags -1 +patch

I'm attaching a patch with the packaging updates I applied when I
updated gparted to 0.28.1 in Ubuntu 17.10.

Thanks,
Jeremy Bicha
=== modified file 'debian/changelog'
--- debian/changelog	2017-08-02 18:01:08 +0000
+++ debian/changelog	2017-08-02 18:52:36 +0000
@@ -1,3 +1,18 @@
+gparted (0.28.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release (LP: #1708184) (Closes: #857015)
+    - Recognize the iso9660 filesystem (LP: #1622313)
+  * Update debian/watch to watch for .gz or .xz tarballs too
+  * Drop obsolete dirs, menu and .xpm
+  * Drop gparted.postinst which fixed a mistake from Debian Lenny
+  * Switch to simple dh7 style rules
+  * Enable all hardening flags
+  * Bump debhelper compat to 10
+  * Update 02_use-pkexec.patch:
+    - Refresh and let autoreconf update generated files
+
+ -- Jeremy Bicha <[email protected]>  Wed, 02 Aug 2017 14:47:22 -0400
+
 gparted (0.25.0-1) unstable; urgency=medium
 
   * New upstream release

=== modified file 'debian/compat'
--- debian/compat	2017-08-02 18:01:08 +0000
+++ debian/compat	2017-08-02 18:37:45 +0000
@@ -1,1 +1,1 @@
-9
+10

=== modified file 'debian/control'
--- debian/control	2017-08-02 18:01:08 +0000
+++ debian/control	2017-08-02 18:37:45 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Phillip Susi <[email protected]>
 Uploaders: Anibal Monsalve Salazar <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), libxml-parser-perl,
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 10), libxml-parser-perl,
  uuid-dev, parted, pkg-config, gnome-doc-utils, rarian-compat,
  libgtkmm-2.4-dev, libparted0-dev (>= 2.2), intltool, gnome-pkg-tools
 Standards-Version: 3.9.6

=== removed file 'debian/dirs'
--- debian/dirs	2017-08-02 18:01:08 +0000
+++ debian/dirs	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/sbin
-usr/share/pixmaps
-

=== removed file 'debian/gparted.postinst'
--- debian/gparted.postinst	2017-08-02 18:01:08 +0000
+++ debian/gparted.postinst	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# versions 0.3.9-1 and 0.3.9-2 shipped /var/lib/scrollkeeper erroneously,
-# overwritting the scrollkeeper database which requires a full rebuild
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" ge "0.3.9-1" && dpkg --compare-versions "$2" lt "0.3.9-3" && [ -x "`which scrollkeeper-rebuilddb 2>/dev/null`" ]; then
-    echo "Upgrade from broken gparted version detected, running scrollkeeper-rebuilddb..."
-    scrollkeeper-rebuilddb -q
-fi
-
-#DEBHELPER#

=== removed file 'debian/gparted.xpm'
--- debian/gparted.xpm	2017-08-02 18:01:08 +0000
+++ debian/gparted.xpm	1970-01-01 00:00:00 +0000
@@ -1,412 +0,0 @@
-/* XPM */
-static char * gparted_xpm[] = {
-"32 32 377 2",
-"  	c None",
-". 	c #424242",
-"+ 	c #545454",
-"@ 	c #535353",
-"# 	c #525252",
-"$ 	c #515151",
-"% 	c #434343",
-"& 	c #D9D9D9",
-"* 	c #FDFDFD",
-"= 	c #FCFCFC",
-"- 	c #FBFBFB",
-"; 	c #FAFAFA",
-"> 	c #F9F9F9",
-", 	c #F8F8F8",
-"' 	c #F7F7F7",
-") 	c #F6F6F6",
-"! 	c #F5F5F5",
-"~ 	c #F4F4F4",
-"{ 	c #F3F3F3",
-"] 	c #F2F2F2",
-"^ 	c #E4E4E4",
-"/ 	c #5A5A5A",
-"( 	c #393939",
-"_ 	c #EFEFEF",
-": 	c #E6E6E6",
-"< 	c #626262",
-"[ 	c #A4A4A4",
-"} 	c #EDEDED",
-"| 	c #F1F1F1",
-"1 	c #F0F0F0",
-"2 	c #EEEEEE",
-"3 	c #EBEBEB",
-"4 	c #E9E9E9",
-"5 	c #E8E8E8",
-"6 	c #E7E7E7",
-"7 	c #E5E5E5",
-"8 	c #E3E3E3",
-"9 	c #E2E2E2",
-"0 	c #E1E1E1",
-"a 	c #DFDFDF",
-"b 	c #DDDDDD",
-"c 	c #DCDCDC",
-"d 	c #DADADA",
-"e 	c #D7D7D7",
-"f 	c #D6D6D6",
-"g 	c #DEDEDE",
-"h 	c #BABABA",
-"i 	c #000000",
-"j 	c #A3A3A3",
-"k 	c #ECECEC",
-"l 	c #E0E0E0",
-"m 	c #D5D5D5",
-"n 	c #D2D2D2",
-"o 	c #D0D0D0",
-"p 	c #CECECE",
-"q 	c #CCCCCC",
-"r 	c #C9C9C9",
-"s 	c #C7C7C7",
-"t 	c #C5C5C5",
-"u 	c #C3C3C3",
-"v 	c #CFCFCF",
-"w 	c #BFBFBF",
-"x 	c #DBDBDB",
-"y 	c #D4D4D4",
-"z 	c #D1D1D1",
-"A 	c #CDCDCD",
-"B 	c #CACACA",
-"C 	c #C6C6C6",
-"D 	c #BCBCBC",
-"E 	c #B9B9B9",
-"F 	c #B6B6B6",
-"G 	c #B2B2B2",
-"H 	c #AFAFAF",
-"I 	c #ACACAC",
-"J 	c #A9A9A9",
-"K 	c #C1C1C1",
-"L 	c #BEBEBE",
-"M 	c #EAEAEA",
-"N 	c #D8D8D8",
-"O 	c #C8C8C8",
-"P 	c #AAAAAA",
-"Q 	c #D3D3D3",
-"R 	c #C4C4C4",
-"S 	c #959292",
-"T 	c #9C8F8C",
-"U 	c #997C76",
-"V 	c #916B63",
-"W 	c #8F6056",
-"X 	c #88584E",
-"Y 	c #87584E",
-"Z 	c #855A52",
-"` 	c #947069",
-" .	c #A38B85",
-"..	c #A69C99",
-"+.	c #969594",
-"@.	c #0C0C0C",
-"#.	c #B8B6B6",
-"$.	c #A38B86",
-"%.	c #B97466",
-"&.	c #BF6655",
-"*.	c #D96F5A",
-"=.	c #E2715B",
-"-.	c #E06D56",
-";.	c #DC6B55",
-">.	c #D86952",
-",.	c #D36750",
-"'.	c #CC634E",
-").	c #BA5B48",
-"!.	c #A55747",
-"~.	c #975D50",
-"{.	c #3B241F",
-"].	c #C5C4C4",
-"^.	c #8C7571",
-"/.	c #C87361",
-"(.	c #E4755E",
-"_.	c #E06C56",
-":.	c #DF6C56",
-"<.	c #DD6B54",
-"[.	c #DA6A53",
-"}.	c #D66851",
-"|.	c #D16650",
-"1.	c #CE654F",
-"2.	c #CA624E",
-"3.	c #C6604C",
-"4.	c #C25F4B",
-"5.	c #BF5D49",
-"6.	c #B75946",
-"7.	c #8C4739",
-"8.	c #CED0D1",
-"9.	c #A48279",
-"0.	c #D77965",
-"a.	c #E16E58",
-"b.	c #DF6C55",
-"c.	c #DC6B54",
-"d.	c #D96952",
-"e.	c #D56750",
-"f.	c #D1654F",
-"g.	c #CD634E",
-"h.	c #C9624D",
-"i.	c #C5604C",
-"j.	c #C25E4B",
-"k.	c #BE5C49",
-"l.	c #BA5A47",
-"m.	c #B65946",
-"n.	c #B35845",
-"o.	c #A45646",
-"p.	c #7A4C43",
-"q.	c #797979",
-"r.	c #7D7D7D",
-"s.	c #7C7C7C",
-"t.	c #818183",
-"u.	c #8E7069",
-"v.	c #E67E68",
-"w.	c #DA6953",
-"x.	c #D36650",
-"y.	c #CE644F",
-"z.	c #CB634E",
-"A.	c #C7614D",
-"B.	c #C4604C",
-"C.	c #BB5B48",
-"D.	c #B75A47",
-"E.	c #B45946",
-"F.	c #B05644",
-"G.	c #AD5543",
-"H.	c #A85342",
-"I.	c #AA5949",
-"J.	c #6A463D",
-"K.	c #4A3E3F",
-"L.	c #C77867",
-"M.	c #E16C56",
-"N.	c #DF6B55",
-"O.	c #DA6952",
-"P.	c #D56751",
-"Q.	c #D16550",
-"R.	c #CD644F",
-"S.	c #C9624E",
-"T.	c #C6614C",
-"U.	c #C25E4A",
-"V.	c #BE5D4A",
-"W.	c #AF5744",
-"X.	c #AB5443",
-"Y.	c #A75342",
-"Z.	c #A35140",
-"`.	c #A0513F",
-" +	c #95594C",
-".+	c #6B4B41",
-"++	c #E47E68",
-"@+	c #DE6B54",
-"#+	c #D76851",
-"$+	c #D26650",
-"%+	c #CF654F",
-"&+	c #CB624D",
-"*+	c #C7614C",
-"=+	c #C35F4B",
-"-+	c #C05D4A",
-";+	c #B85946",
-">+	c #B45846",
-",+	c #B15845",
-"'+	c #AC5543",
-")+	c #A95342",
-"!+	c #A55241",
-"~+	c #A2513F",
-"{+	c #9E4E3E",
-"]+	c #9A4D3D",
-"^+	c #A25C4D",
-"/+	c #64443C",
-"(+	c #67463D",
-"_+	c #E37D67",
-":+	c #D96A53",
-"<+	c #CA624D",
-"[+	c #BC604A",
-"}+	c #88776E",
-"|+	c #7B7170",
-"1+	c #766E6D",
-"2+	c #736B6B",
-"3+	c #6F6968",
-"4+	c #6C6665",
-"5+	c #686362",
-"6+	c #65615E",
-"7+	c #615F5C",
-"8+	c #5E5D5A",
-"9+	c #6C6966",
-"0+	c #5E5754",
-"a+	c #614B43",
-"b+	c #E3846D",
-"c+	c #C7604D",
-"d+	c #BC5C49",
-"e+	c #B85A47",
-"f+	c #C38854",
-"g+	c #91BC8B",
-"h+	c #3692AA",
-"i+	c #2D8EA6",
-"j+	c #2A89A1",
-"k+	c #26849B",
-"l+	c #248097",
-"m+	c #1F7C90",
-"n+	c #1C788C",
-"o+	c #197387",
-"p+	c #166F82",
-"q+	c #327F8C",
-"r+	c #355155",
-"s+	c #64524E",
-"t+	c #EB9B86",
-"u+	c #D16750",
-"v+	c #CF644F",
-"w+	c #BF5C49",
-"x+	c #B45B46",
-"y+	c #CCAE5E",
-"z+	c #C4D372",
-"A+	c #539C98",
-"B+	c #2B8AA2",
-"C+	c #27869E",
-"D+	c #217D92",
-"E+	c #1D798D",
-"F+	c #1A7588",
-"G+	c #146E7F",
-"H+	c #46848F",
-"I+	c #223538",
-"J+	c #534341",
-"K+	c #E6AF9F",
-"L+	c #DD7F6A",
-"M+	c #C9634F",
-"N+	c #C45F4B",
-"O+	c #BC5B48",
-"P+	c #B95A47",
-"Q+	c #B56E4B",
-"R+	c #D3C965",
-"S+	c #D3D96A",
-"T+	c #A0BD77",
-"U+	c #2A869B",
-"V+	c #248198",
-"W+	c #207E92",
-"X+	c #1D7B8E",
-"Y+	c #1A7487",
-"Z+	c #167083",
-"`+	c #177080",
-" @	c #3B8491",
-".@	c #386269",
-"+@	c #111F21",
-"@@	c #514644",
-"#@	c #B98A81",
-"$@	c #E8A492",
-"%@	c #D37662",
-"&@	c #BE5D49",
-"*@	c #AF5644",
-"=@	c #BA8752",
-"-@	c #D5D769",
-";@	c #CFD469",
-">@	c #C7CD66",
-",@	c #519589",
-"'@	c #217E93",
-")@	c #1B7689",
-"!@	c #156D7F",
-"~@	c #3F8793",
-"{@	c #44747C",
-"]@	c #17353A",
-"^@	c #6D5652",
-"/@	c #BA887C",
-"(@	c #E0A08F",
-"_@	c #D27966",
-":@	c #BC604D",
-"<@	c #AE5644",
-"[@	c #A65341",
-"}@	c #C7B25E",
-"|@	c #D1D568",
-"1@	c #C9CF65",
-"2@	c #C5CB63",
-"3@	c #9AB26A",
-"4@	c #328087",
-"5@	c #1C7587",
-"6@	c #317D8D",
-"7@	c #4C8691",
-"8@	c #376067",
-"9@	c #1C4148",
-"0@	c #0B1315",
-"a@	c #4C3833",
-"b@	c #9B6E64",
-"c@	c #CF8E7E",
-"d@	c #CA806F",
-"e@	c #BB6754",
-"f@	c #AC5645",
-"g@	c #A75C43",
-"h@	c #CECF66",
-"i@	c #CDD166",
-"j@	c #C6CC63",
-"k@	c #C1C661",
-"l@	c #B7BE60",
-"m@	c #659678",
-"n@	c #3A8896",
-"o@	c #4D8B96",
-"p@	c #437078",
-"q@	c #2C535C",
-"r@	c #193D44",
-"s@	c #102023",
-"t@	c #110B0B",
-"u@	c #64453E",
-"v@	c #9A675C",
-"w@	c #B87969",
-"x@	c #B47163",
-"y@	c #A96253",
-"z@	c #AE7F53",
-"A@	c #C2C465",
-"B@	c #C0C066",
-"C@	c #BEBC67",
-"D@	c #BBB96A",
-"E@	c #B7B26C",
-"F@	c #A09D67",
-"G@	c #335D68",
-"H@	c #214C57",
-"I@	c #1B4149",
-"J@	c #143036",
-"K@	c #091011",
-"L@	c #281B19",
-"M@	c #543730",
-"N@	c #7C4F45",
-"O@	c #A76659",
-"P@	c #A88256",
-"Q@	c #A7AA55",
-"R@	c #A1A353",
-"S@	c #989950",
-"T@	c #90914C",
-"U@	c #868846",
-"V@	c #7C7D44",
-"W@	c #1F4751",
-"X@	c #173137",
-"Y@	c #0B1518",
-"Z@	c #040707",
-"`@	c #020000",
-" #	c #0F0907",
-".#	c #292216",
-"+#	c #53542C",
-"@#	c #59572E",
-"##	c #55542C",
-"$#	c #474825",
-"%#	c #3A3A1F",
-"&#	c #282816",
-"*#	c #020202",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"      . + + + + @ @ @ @ @ # # # # $ $ $ $ %                     ",
-"    . & * = - - ; > > , , ' ) ! ! ~ ~ { ] ^ /                   ",
-"  ( _ * = = - - ; ; > > , , , ' ' ) ) ) ! ~ : <                 ",
-"  [ } | 1 2 } 3 4 5 6 7 8 9 0 a b c d & e f g h i               ",
-"  j k k 4 6 7 8 l g c d e m n o p q r s t u v w i               ",
-"  j k 3 x e y z A B C u w D E F G H I J K r v L i               ",
-"  j k M c M 3 M 5 : ^ 8 l a b c & N f y l p q F i               ",
-"  j 3 4 b 3 3 4 5 : ^ 9 l a b x & N f y a p O P i               ",
-"  j 3 4 x c N f Q o A R S T U V W X Y Z `  ...+.@.              ",
-"  j M 5 4 3 4 5 : ^ #.$.%.&.*.=.-.;.>.,.'.).!.~.{.              ",
-"  j 4 6 ^ 9 l g ].^./.(._._.:.<.[.}.|.1.2.3.4.5.6.7.            ",
-"i j l a a g b 8.9.0.a._._.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.        ",
-"  q.r.s.s.s.t.u.v._._._.<.w.}.x.y.z.A.B.5.C.D.E.F.G.H.I.J.      ",
-"      i i i K.L.M._.N.<.O.P.Q.R.S.T.U.V.l.6.n.W.X.Y.Z.`. +      ",
-"            .+++:.@+[.#+$+%+&+*+=+-+C.;+>+,+'+)+!+~+{+]+^+/+    ",
-"            (+_+c.:+P.|.R.<+3.4.k.[+}+|+1+2+3+4+5+6+7+8+9+0+    ",
-"            a+b+#+x.%+'.c+B.5.d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+    ",
-"            s+t+u+v+2.T.U.w+C.e+x+y+z+A+B+C+l+D+E+F+p+G+H+I+    ",
-"            J+K+L+M+N+-+O+P+>+,+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@    ",
-"            @@#@$@%@&@C.D.E.*@G.=@-@;@>@,@'@X+)@Z+!@~@{@]@      ",
-"              ^@/@(@_@:@,+<@)+[@}@|@1@2@3@4@)@5@6@7@8@9@0@      ",
-"                a@b@c@d@e@f@!+g@h@i@j@k@l@m@n@o@p@q@r@s@i       ",
-"                  t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@          ",
-"                      L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@            ",
-"                          `@ #.#+#@###$#%#&#*#                  ",
-"                                                                ",
-"                                                                ",
-"                                                                "};

=== removed file 'debian/menu'
--- debian/menu	2017-08-02 18:01:08 +0000
+++ debian/menu	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-?package(gparted):\
-	needs="X11"\
-	section="Applications/System/Administration"\
-	title="GNOME partition editor"\
-	command="su-to-root -X -c /usr/sbin/gparted"\
-	icon="/usr/share/pixmaps/gparted.xpm"

=== modified file 'debian/patches/02_use-pkexec.patch'
--- debian/patches/02_use-pkexec.patch	2017-08-02 18:01:08 +0000
+++ debian/patches/02_use-pkexec.patch	2017-08-02 18:37:48 +0000
@@ -4,8 +4,13 @@
  it with pkexec so things like two-factor authentication work. The patch
  adds the policykit policy files required for pkexec.
 
-Index: b/data/Makefile.am
-===================================================================
+---
+ data/Makefile.am                         |    9 +++++++++
+ data/com.ubuntu.pkexec.gparted.policy.in |   19 +++++++++++++++++++
+ po/POTFILES.in                           |    1 +
+ po/POTFILES.skip                         |    1 +
+ 4 files changed, 30 insertions(+)
+
 --- a/data/Makefile.am
 +++ b/data/Makefile.am
 @@ -1 +1,10 @@
@@ -19,172 +24,6 @@
 +@INTLTOOL_POLICY_RULE@
 +
 +EXTRA_DIST = $(dist_polkit_policy_in_files)
-Index: b/data/Makefile.in
-===================================================================
---- a/data/Makefile.in
-+++ b/data/Makefile.in
-@@ -13,6 +13,7 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
-+
- VPATH = @srcdir@
- am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
- am__make_running_with_option = \
-@@ -78,7 +79,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- subdir = data
--DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-+DIST_COMMON = $(srcdir/dist_polkit_policy_DATA) $(srcdir)/Makefile.in $(srcdir)/Makefile.am
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-@@ -113,6 +114,29 @@ RECURSIVE_TARGETS = all-recursive check-
- 	install-ps-recursive install-recursive installcheck-recursive \
- 	installdirs-recursive pdf-recursive ps-recursive \
- 	tags-recursive uninstall-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+  for p in $$list; do echo "$$p $$p"; done | \
-+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+    if (++n[$$2] == $(am__install_max)) \
-+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+    END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__installdirs = "$(DESTDIR)$(polkit_policydir)"
-+DATA = $(dist_polkit_policy_DATA)
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-@@ -335,6 +359,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = icons
-+polkit_policydir = $(datadir)/polkit-1/actions
-+dist_polkit_policy_in_files = com.ubuntu.pkexec.gparted.policy.in
-+dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
-+EXTRA_DIST = $(dist_polkit_policy_in_files)
- all: all-recursive
- 
- .SUFFIXES:
-@@ -374,6 +402,26 @@ mostlyclean-libtool:
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+install-dist_polkit_policyDATA: $(dist_polkit_policy_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(polkit_policydir)" || $(MKDIR_P) "$(DESTDIR)$(polkit_policydir)"
-+	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkit_policydir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(polkit_policydir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_polkit_policyDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(polkit_policydir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(polkit_policydir)" && rm -f $$files
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run 'make' without going through this Makefile.
-@@ -531,9 +579,12 @@ distdir: $(DISTFILES)
- 	done
- check-am: all-am
- check: check-recursive
--all-am: Makefile
-+all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-+	for dir in "$(DESTDIR)$(polkit_policydir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -584,7 +635,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am:
-+install-data-am: install-dist_polkit_policyDATA
- 
- install-dvi: install-dvi-recursive
- 
-@@ -628,7 +679,7 @@ ps: ps-recursive
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-dist_polkit_policyDATA
- 
- .MAKE: $(am__recursive_targets) install-am install-strip
- 
-@@ -636,15 +687,16 @@ uninstall-am:
- 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
- 	ctags-am distclean distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
-+	install install-am install-data install-data-am install-dist_polkit_policyDATA install-dvi \
- 	install-dvi-am install-exec install-exec-am install-html \
- 	install-html-am install-info install-info-am install-man \
- 	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am tags tags-am uninstall uninstall-am
-+	ps ps-am tags tags-am uninstall uninstall-am uninstall-dist_polkit_policyDATA
- 
-+@INTLTOOL_POLICY_RULE@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: b/data/com.ubuntu.pkexec.gparted.policy
-===================================================================
---- /dev/null
-+++ b/data/com.ubuntu.pkexec.gparted.policy
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE policyconfig PUBLIC
-+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd";>
-+<policyconfig>
-+
-+  <action id="com.ubuntu.pkexec.gparted">
-+    <message>Authentication is required to run the GParted Partition Editor</message>
-+    <icon_name>gparted</icon_name>
-+    <defaults>
-+      <allow_any>auth_admin</allow_any>
-+      <allow_inactive>auth_admin</allow_inactive>
-+      <allow_active>auth_admin</allow_active>
-+    </defaults>
-+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
-+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-+  </action>
-+
-+</policyconfig>
-Index: b/data/com.ubuntu.pkexec.gparted.policy.in
-===================================================================
 --- /dev/null
 +++ b/data/com.ubuntu.pkexec.gparted.policy.in
 @@ -0,0 +1,19 @@
@@ -207,8 +46,6 @@
 +  </action>
 +
 +</policyconfig>
-Index: b/po/POTFILES.in
-===================================================================
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,5 +1,6 @@
@@ -218,3 +55,12 @@
  gparted.appdata.xml.in
  gparted.desktop.in.in
  include/Utils.h
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,5 +1,6 @@
+ # List of source files containing translatable strings, but should be skipped.
+ # Please keep this file sorted alphabetically.
++data/com.ubuntu.pkexec.gparted.policy
+ gparted.desktop.in
+ # https://bugs.launchpad.net/intltool/+bug/1117944
+ sub/gparted.desktop.in

=== modified file 'debian/rules'
--- debian/rules	2017-08-02 18:01:08 +0000
+++ debian/rules	2017-08-02 18:37:45 +0000
@@ -1,74 +1,20 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DH_VERBOSE=1
-
-PACKAGE=gparted
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-CFLAGS += -Wall -g -O3
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-config.status: configure
-	dh_testdir
-	rm -rf .pc
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-help-dir=\$${prefix}/share/gnome/help --enable-libparted-dmraid --enable-online-resize
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	$(MAKE) check
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/gparted
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+%:
+	dh $@
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-libparted-dmraid --enable-online-resize
+
+override_dh_install:
+	dh_install
 	rm -fr $(CURDIR)/debian/gparted/var
 	install -D -p -o root -g root -m 755 debian/gparted-pkexec debian/gparted/usr/bin/gparted-pkexec
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_install
-	dh_link
-	cp debian/gparted.xpm debian/gparted/usr/share/pixmaps
-	# use translations of availible
 	if dh -l | grep translations ; then dh_translations ; fi
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

=== modified file 'debian/watch'
--- debian/watch	2017-08-02 18:01:08 +0000
+++ debian/watch	2017-08-02 18:37:45 +0000
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/gparted/gparted-(.+)\.tar\.bz2
+http://sf.net/gparted/gparted-(.+)\.tar\.gz|bz2|xz

Reply via email to