Merge lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs into lp:ubuntu/trusty/partclone
- Trusty (14.04)
- arm64-ftbfs
- Merge into trusty
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Adam Conrad | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs | ||||
Merge into: | lp:ubuntu/trusty/partclone | ||||
Diff against target: |
773 lines (+691/-4) 8 files modified
.pc/applied-patches (+1/-0) .pc/fix-autoreconf-warnings.patch/m4/po.m4 (+428/-0) .pc/fix-autoreconf-warnings.patch/src/Makefile.am (+191/-0) debian/changelog (+7/-0) debian/patches/fix-autoreconf-warnings.patch (+55/-0) debian/patches/series (+1/-0) m4/po.m4 (+1/-1) src/Makefile.am (+7/-3) |
||||
To merge this branch: | bzr merge lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dann frazier | Needs Resubmitting | ||
Marc Deslauriers | Needs Fixing | ||
Review via email: mp+207755@code.launchpad.net |
Commit message
Description of the change
Sebastien Bacher (seb128) wrote : | # |
dann frazier (dannf) wrote : | # |
On Wed, Feb 26, 2014 at 4:00 AM, Sebastien Bacher <email address hidden> wrote:
> Thanks for the work. Would it make sense to foward that fix to Debian as well?
It seems to be an Ubuntu-specific issue that automake warnings are
treated as errors here. There's nothing truly arch-specific here.
In fact, without these changes, partclone currently FTBFS on x86 in
trusty as well, while it builds fine in sid.
Marc Deslauriers (mdeslaur) wrote : | # |
Thanks for the merge request.
This package uses the quilt patch system. Please convert your changes to a proper patch, including patch headers.
Thanks!
- 19. By dann frazier
-
This issue is not arch-specific; correct changelog
- 20. By dann frazier
-
Use existing quilt system for patch
- 21. By dann frazier
-
Add dep-3 headers
dann frazier (dannf) wrote : | # |
Thanks for the review. I've converted the patch to quilt and included dep-3 headers.
I've also submitted these changes upstream and included a reference in the dep-3 Forwarded field.
- 22. By dann frazier
-
Patches accepted upstream, update DEP-3 headers
dann frazier (dannf) wrote : | # |
fyi, patches now accepted upstream. dep-3 headers updated.
Preview Diff
1 | === modified file '.pc/applied-patches' | |||
2 | --- .pc/applied-patches 2012-11-25 21:09:00 +0000 | |||
3 | +++ .pc/applied-patches 2014-03-26 02:58:34 +0000 | |||
4 | @@ -1,3 +1,4 @@ | |||
5 | 1 | 10-configure.ac.patch | 1 | 10-configure.ac.patch |
6 | 2 | 20-reiserfsclone.patch | 2 | 20-reiserfsclone.patch |
7 | 3 | upstream-translation-changes.patch | 3 | upstream-translation-changes.patch |
8 | 4 | fix-autoreconf-warnings.patch | ||
9 | 4 | 5 | ||
10 | === added directory '.pc/fix-autoreconf-warnings.patch' | |||
11 | === added directory '.pc/fix-autoreconf-warnings.patch/m4' | |||
12 | === added file '.pc/fix-autoreconf-warnings.patch/m4/po.m4' | |||
13 | --- .pc/fix-autoreconf-warnings.patch/m4/po.m4 1970-01-01 00:00:00 +0000 | |||
14 | +++ .pc/fix-autoreconf-warnings.patch/m4/po.m4 2014-03-26 02:58:34 +0000 | |||
15 | @@ -0,0 +1,428 @@ | |||
16 | 1 | # po.m4 serial 13 (gettext-0.15) | ||
17 | 2 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | ||
18 | 3 | dnl This file is free software; the Free Software Foundation | ||
19 | 4 | dnl gives unlimited permission to copy and/or distribute it, | ||
20 | 5 | dnl with or without modifications, as long as this notice is preserved. | ||
21 | 6 | dnl | ||
22 | 7 | dnl This file can can be used in projects which are not available under | ||
23 | 8 | dnl the GNU General Public License or the GNU Library General Public | ||
24 | 9 | dnl License but which still want to provide support for the GNU gettext | ||
25 | 10 | dnl functionality. | ||
26 | 11 | dnl Please note that the actual code of the GNU gettext library is covered | ||
27 | 12 | dnl by the GNU Library General Public License, and the rest of the GNU | ||
28 | 13 | dnl gettext package package is covered by the GNU General Public License. | ||
29 | 14 | dnl They are *not* in the public domain. | ||
30 | 15 | |||
31 | 16 | dnl Authors: | ||
32 | 17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | ||
33 | 18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | ||
34 | 19 | |||
35 | 20 | AC_PREREQ(2.50) | ||
36 | 21 | |||
37 | 22 | dnl Checks for all prerequisites of the po subdirectory. | ||
38 | 23 | AC_DEFUN([AM_PO_SUBDIRS], | ||
39 | 24 | [ | ||
40 | 25 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | ||
41 | 26 | AC_REQUIRE([AC_PROG_INSTALL])dnl | ||
42 | 27 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | ||
43 | 28 | AC_REQUIRE([AM_NLS])dnl | ||
44 | 29 | |||
45 | 30 | dnl Perform the following tests also if --disable-nls has been given, | ||
46 | 31 | dnl because they are needed for "make dist" to work. | ||
47 | 32 | |||
48 | 33 | dnl Search for GNU msgfmt in the PATH. | ||
49 | 34 | dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. | ||
50 | 35 | dnl The second test excludes FreeBSD msgfmt. | ||
51 | 36 | AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, | ||
52 | 37 | [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && | ||
53 | 38 | (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], | ||
54 | 39 | :) | ||
55 | 40 | AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) | ||
56 | 41 | |||
57 | 42 | dnl Test whether it is GNU msgfmt >= 0.15. | ||
58 | 43 | changequote(,)dnl | ||
59 | 44 | case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | ||
60 | 45 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; | ||
61 | 46 | *) MSGFMT_015=$MSGFMT ;; | ||
62 | 47 | esac | ||
63 | 48 | changequote([,])dnl | ||
64 | 49 | AC_SUBST([MSGFMT_015]) | ||
65 | 50 | changequote(,)dnl | ||
66 | 51 | case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | ||
67 | 52 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; | ||
68 | 53 | *) GMSGFMT_015=$GMSGFMT ;; | ||
69 | 54 | esac | ||
70 | 55 | changequote([,])dnl | ||
71 | 56 | AC_SUBST([GMSGFMT_015]) | ||
72 | 57 | |||
73 | 58 | dnl Search for GNU xgettext 0.12 or newer in the PATH. | ||
74 | 59 | dnl The first test excludes Solaris xgettext and early GNU xgettext versions. | ||
75 | 60 | dnl The second test excludes FreeBSD xgettext. | ||
76 | 61 | AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, | ||
77 | 62 | [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && | ||
78 | 63 | (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], | ||
79 | 64 | :) | ||
80 | 65 | dnl Remove leftover from FreeBSD xgettext call. | ||
81 | 66 | rm -f messages.po | ||
82 | 67 | |||
83 | 68 | dnl Test whether it is GNU xgettext >= 0.15. | ||
84 | 69 | changequote(,)dnl | ||
85 | 70 | case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | ||
86 | 71 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; | ||
87 | 72 | *) XGETTEXT_015=$XGETTEXT ;; | ||
88 | 73 | esac | ||
89 | 74 | changequote([,])dnl | ||
90 | 75 | AC_SUBST([XGETTEXT_015]) | ||
91 | 76 | |||
92 | 77 | dnl Search for GNU msgmerge 0.11 or newer in the PATH. | ||
93 | 78 | AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, | ||
94 | 79 | [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) | ||
95 | 80 | |||
96 | 81 | dnl Installation directories. | ||
97 | 82 | dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we | ||
98 | 83 | dnl have to define it here, so that it can be used in po/Makefile. | ||
99 | 84 | test -n "$localedir" || localedir='${datadir}/locale' | ||
100 | 85 | AC_SUBST([localedir]) | ||
101 | 86 | |||
102 | 87 | AC_CONFIG_COMMANDS([po-directories], [[ | ||
103 | 88 | for ac_file in $CONFIG_FILES; do | ||
104 | 89 | # Support "outfile[:infile[:infile...]]" | ||
105 | 90 | case "$ac_file" in | ||
106 | 91 | *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; | ||
107 | 92 | esac | ||
108 | 93 | # PO directories have a Makefile.in generated from Makefile.in.in. | ||
109 | 94 | case "$ac_file" in */Makefile.in) | ||
110 | 95 | # Adjust a relative srcdir. | ||
111 | 96 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ||
112 | 97 | ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" | ||
113 | 98 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | ||
114 | 99 | # In autoconf-2.13 it is called $ac_given_srcdir. | ||
115 | 100 | # In autoconf-2.50 it is called $srcdir. | ||
116 | 101 | test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" | ||
117 | 102 | case "$ac_given_srcdir" in | ||
118 | 103 | .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; | ||
119 | 104 | /*) top_srcdir="$ac_given_srcdir" ;; | ||
120 | 105 | *) top_srcdir="$ac_dots$ac_given_srcdir" ;; | ||
121 | 106 | esac | ||
122 | 107 | # Treat a directory as a PO directory if and only if it has a | ||
123 | 108 | # POTFILES.in file. This allows packages to have multiple PO | ||
124 | 109 | # directories under different names or in different locations. | ||
125 | 110 | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then | ||
126 | 111 | rm -f "$ac_dir/POTFILES" | ||
127 | 112 | test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" | ||
128 | 113 | cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" | ||
129 | 114 | POMAKEFILEDEPS="POTFILES.in" | ||
130 | 115 | # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend | ||
131 | 116 | # on $ac_dir but don't depend on user-specified configuration | ||
132 | 117 | # parameters. | ||
133 | 118 | if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then | ||
134 | 119 | # The LINGUAS file contains the set of available languages. | ||
135 | 120 | if test -n "$OBSOLETE_ALL_LINGUAS"; then | ||
136 | 121 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" | ||
137 | 122 | fi | ||
138 | 123 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | ||
139 | 124 | # Hide the ALL_LINGUAS assigment from automake < 1.5. | ||
140 | 125 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | ||
141 | 126 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | ||
142 | 127 | else | ||
143 | 128 | # The set of available languages was given in configure.in. | ||
144 | 129 | # Hide the ALL_LINGUAS assigment from automake < 1.5. | ||
145 | 130 | eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' | ||
146 | 131 | fi | ||
147 | 132 | # Compute POFILES | ||
148 | 133 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | ||
149 | 134 | # Compute UPDATEPOFILES | ||
150 | 135 | # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) | ||
151 | 136 | # Compute DUMMYPOFILES | ||
152 | 137 | # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) | ||
153 | 138 | # Compute GMOFILES | ||
154 | 139 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) | ||
155 | 140 | case "$ac_given_srcdir" in | ||
156 | 141 | .) srcdirpre= ;; | ||
157 | 142 | *) srcdirpre='$(srcdir)/' ;; | ||
158 | 143 | esac | ||
159 | 144 | POFILES= | ||
160 | 145 | UPDATEPOFILES= | ||
161 | 146 | DUMMYPOFILES= | ||
162 | 147 | GMOFILES= | ||
163 | 148 | for lang in $ALL_LINGUAS; do | ||
164 | 149 | POFILES="$POFILES $srcdirpre$lang.po" | ||
165 | 150 | UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" | ||
166 | 151 | DUMMYPOFILES="$DUMMYPOFILES $lang.nop" | ||
167 | 152 | GMOFILES="$GMOFILES $srcdirpre$lang.gmo" | ||
168 | 153 | done | ||
169 | 154 | # CATALOGS depends on both $ac_dir and the user's LINGUAS | ||
170 | 155 | # environment variable. | ||
171 | 156 | INST_LINGUAS= | ||
172 | 157 | if test -n "$ALL_LINGUAS"; then | ||
173 | 158 | for presentlang in $ALL_LINGUAS; do | ||
174 | 159 | useit=no | ||
175 | 160 | if test "%UNSET%" != "$LINGUAS"; then | ||
176 | 161 | desiredlanguages="$LINGUAS" | ||
177 | 162 | else | ||
178 | 163 | desiredlanguages="$ALL_LINGUAS" | ||
179 | 164 | fi | ||
180 | 165 | for desiredlang in $desiredlanguages; do | ||
181 | 166 | # Use the presentlang catalog if desiredlang is | ||
182 | 167 | # a. equal to presentlang, or | ||
183 | 168 | # b. a variant of presentlang (because in this case, | ||
184 | 169 | # presentlang can be used as a fallback for messages | ||
185 | 170 | # which are not translated in the desiredlang catalog). | ||
186 | 171 | case "$desiredlang" in | ||
187 | 172 | "$presentlang"*) useit=yes;; | ||
188 | 173 | esac | ||
189 | 174 | done | ||
190 | 175 | if test $useit = yes; then | ||
191 | 176 | INST_LINGUAS="$INST_LINGUAS $presentlang" | ||
192 | 177 | fi | ||
193 | 178 | done | ||
194 | 179 | fi | ||
195 | 180 | CATALOGS= | ||
196 | 181 | if test -n "$INST_LINGUAS"; then | ||
197 | 182 | for lang in $INST_LINGUAS; do | ||
198 | 183 | CATALOGS="$CATALOGS $lang.gmo" | ||
199 | 184 | done | ||
200 | 185 | fi | ||
201 | 186 | test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" | ||
202 | 187 | sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" | ||
203 | 188 | for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do | ||
204 | 189 | if test -f "$f"; then | ||
205 | 190 | case "$f" in | ||
206 | 191 | *.orig | *.bak | *~) ;; | ||
207 | 192 | *) cat "$f" >> "$ac_dir/Makefile" ;; | ||
208 | 193 | esac | ||
209 | 194 | fi | ||
210 | 195 | done | ||
211 | 196 | fi | ||
212 | 197 | ;; | ||
213 | 198 | esac | ||
214 | 199 | done]], | ||
215 | 200 | [# Capture the value of obsolete ALL_LINGUAS because we need it to compute | ||
216 | 201 | # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it | ||
217 | 202 | # from automake < 1.5. | ||
218 | 203 | eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' | ||
219 | 204 | # Capture the value of LINGUAS because we need it to compute CATALOGS. | ||
220 | 205 | LINGUAS="${LINGUAS-%UNSET%}" | ||
221 | 206 | ]) | ||
222 | 207 | ]) | ||
223 | 208 | |||
224 | 209 | dnl Postprocesses a Makefile in a directory containing PO files. | ||
225 | 210 | AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], | ||
226 | 211 | [ | ||
227 | 212 | # When this code is run, in config.status, two variables have already been | ||
228 | 213 | # set: | ||
229 | 214 | # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, | ||
230 | 215 | # - LINGUAS is the value of the environment variable LINGUAS at configure | ||
231 | 216 | # time. | ||
232 | 217 | |||
233 | 218 | changequote(,)dnl | ||
234 | 219 | # Adjust a relative srcdir. | ||
235 | 220 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ||
236 | 221 | ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" | ||
237 | 222 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | ||
238 | 223 | # In autoconf-2.13 it is called $ac_given_srcdir. | ||
239 | 224 | # In autoconf-2.50 it is called $srcdir. | ||
240 | 225 | test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" | ||
241 | 226 | case "$ac_given_srcdir" in | ||
242 | 227 | .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; | ||
243 | 228 | /*) top_srcdir="$ac_given_srcdir" ;; | ||
244 | 229 | *) top_srcdir="$ac_dots$ac_given_srcdir" ;; | ||
245 | 230 | esac | ||
246 | 231 | |||
247 | 232 | # Find a way to echo strings without interpreting backslash. | ||
248 | 233 | if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then | ||
249 | 234 | gt_echo='echo' | ||
250 | 235 | else | ||
251 | 236 | if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then | ||
252 | 237 | gt_echo='printf %s\n' | ||
253 | 238 | else | ||
254 | 239 | echo_func () { | ||
255 | 240 | cat <<EOT | ||
256 | 241 | $* | ||
257 | 242 | EOT | ||
258 | 243 | } | ||
259 | 244 | gt_echo='echo_func' | ||
260 | 245 | fi | ||
261 | 246 | fi | ||
262 | 247 | |||
263 | 248 | # A sed script that extracts the value of VARIABLE from a Makefile. | ||
264 | 249 | sed_x_variable=' | ||
265 | 250 | # Test if the hold space is empty. | ||
266 | 251 | x | ||
267 | 252 | s/P/P/ | ||
268 | 253 | x | ||
269 | 254 | ta | ||
270 | 255 | # Yes it was empty. Look if we have the expected variable definition. | ||
271 | 256 | /^[ ]*VARIABLE[ ]*=/{ | ||
272 | 257 | # Seen the first line of the variable definition. | ||
273 | 258 | s/^[ ]*VARIABLE[ ]*=// | ||
274 | 259 | ba | ||
275 | 260 | } | ||
276 | 261 | bd | ||
277 | 262 | :a | ||
278 | 263 | # Here we are processing a line from the variable definition. | ||
279 | 264 | # Remove comment, more precisely replace it with a space. | ||
280 | 265 | s/#.*$/ / | ||
281 | 266 | # See if the line ends in a backslash. | ||
282 | 267 | tb | ||
283 | 268 | :b | ||
284 | 269 | s/\\$// | ||
285 | 270 | # Print the line, without the trailing backslash. | ||
286 | 271 | p | ||
287 | 272 | tc | ||
288 | 273 | # There was no trailing backslash. The end of the variable definition is | ||
289 | 274 | # reached. Clear the hold space. | ||
290 | 275 | s/^.*$// | ||
291 | 276 | x | ||
292 | 277 | bd | ||
293 | 278 | :c | ||
294 | 279 | # A trailing backslash means that the variable definition continues in the | ||
295 | 280 | # next line. Put a nonempty string into the hold space to indicate this. | ||
296 | 281 | s/^.*$/P/ | ||
297 | 282 | x | ||
298 | 283 | :d | ||
299 | 284 | ' | ||
300 | 285 | changequote([,])dnl | ||
301 | 286 | |||
302 | 287 | # Set POTFILES to the value of the Makefile variable POTFILES. | ||
303 | 288 | sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'` | ||
304 | 289 | POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` | ||
305 | 290 | # Compute POTFILES_DEPS as | ||
306 | 291 | # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) | ||
307 | 292 | POTFILES_DEPS= | ||
308 | 293 | for file in $POTFILES; do | ||
309 | 294 | POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" | ||
310 | 295 | done | ||
311 | 296 | POMAKEFILEDEPS="" | ||
312 | 297 | |||
313 | 298 | if test -n "$OBSOLETE_ALL_LINGUAS"; then | ||
314 | 299 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" | ||
315 | 300 | fi | ||
316 | 301 | if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then | ||
317 | 302 | # The LINGUAS file contains the set of available languages. | ||
318 | 303 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | ||
319 | 304 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | ||
320 | 305 | else | ||
321 | 306 | # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. | ||
322 | 307 | sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` | ||
323 | 308 | ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` | ||
324 | 309 | fi | ||
325 | 310 | # Hide the ALL_LINGUAS assigment from automake < 1.5. | ||
326 | 311 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | ||
327 | 312 | # Compute POFILES | ||
328 | 313 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | ||
329 | 314 | # Compute UPDATEPOFILES | ||
330 | 315 | # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) | ||
331 | 316 | # Compute DUMMYPOFILES | ||
332 | 317 | # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) | ||
333 | 318 | # Compute GMOFILES | ||
334 | 319 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) | ||
335 | 320 | # Compute PROPERTIESFILES | ||
336 | 321 | # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) | ||
337 | 322 | # Compute CLASSFILES | ||
338 | 323 | # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) | ||
339 | 324 | # Compute QMFILES | ||
340 | 325 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) | ||
341 | 326 | # Compute MSGFILES | ||
342 | 327 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) | ||
343 | 328 | # Compute RESOURCESDLLFILES | ||
344 | 329 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) | ||
345 | 330 | case "$ac_given_srcdir" in | ||
346 | 331 | .) srcdirpre= ;; | ||
347 | 332 | *) srcdirpre='$(srcdir)/' ;; | ||
348 | 333 | esac | ||
349 | 334 | POFILES= | ||
350 | 335 | UPDATEPOFILES= | ||
351 | 336 | DUMMYPOFILES= | ||
352 | 337 | GMOFILES= | ||
353 | 338 | PROPERTIESFILES= | ||
354 | 339 | CLASSFILES= | ||
355 | 340 | QMFILES= | ||
356 | 341 | MSGFILES= | ||
357 | 342 | RESOURCESDLLFILES= | ||
358 | 343 | for lang in $ALL_LINGUAS; do | ||
359 | 344 | POFILES="$POFILES $srcdirpre$lang.po" | ||
360 | 345 | UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" | ||
361 | 346 | DUMMYPOFILES="$DUMMYPOFILES $lang.nop" | ||
362 | 347 | GMOFILES="$GMOFILES $srcdirpre$lang.gmo" | ||
363 | 348 | PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" | ||
364 | 349 | CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" | ||
365 | 350 | QMFILES="$QMFILES $srcdirpre$lang.qm" | ||
366 | 351 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | ||
367 | 352 | MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" | ||
368 | 353 | frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` | ||
369 | 354 | RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" | ||
370 | 355 | done | ||
371 | 356 | # CATALOGS depends on both $ac_dir and the user's LINGUAS | ||
372 | 357 | # environment variable. | ||
373 | 358 | INST_LINGUAS= | ||
374 | 359 | if test -n "$ALL_LINGUAS"; then | ||
375 | 360 | for presentlang in $ALL_LINGUAS; do | ||
376 | 361 | useit=no | ||
377 | 362 | if test "%UNSET%" != "$LINGUAS"; then | ||
378 | 363 | desiredlanguages="$LINGUAS" | ||
379 | 364 | else | ||
380 | 365 | desiredlanguages="$ALL_LINGUAS" | ||
381 | 366 | fi | ||
382 | 367 | for desiredlang in $desiredlanguages; do | ||
383 | 368 | # Use the presentlang catalog if desiredlang is | ||
384 | 369 | # a. equal to presentlang, or | ||
385 | 370 | # b. a variant of presentlang (because in this case, | ||
386 | 371 | # presentlang can be used as a fallback for messages | ||
387 | 372 | # which are not translated in the desiredlang catalog). | ||
388 | 373 | case "$desiredlang" in | ||
389 | 374 | "$presentlang"*) useit=yes;; | ||
390 | 375 | esac | ||
391 | 376 | done | ||
392 | 377 | if test $useit = yes; then | ||
393 | 378 | INST_LINGUAS="$INST_LINGUAS $presentlang" | ||
394 | 379 | fi | ||
395 | 380 | done | ||
396 | 381 | fi | ||
397 | 382 | CATALOGS= | ||
398 | 383 | JAVACATALOGS= | ||
399 | 384 | QTCATALOGS= | ||
400 | 385 | TCLCATALOGS= | ||
401 | 386 | CSHARPCATALOGS= | ||
402 | 387 | if test -n "$INST_LINGUAS"; then | ||
403 | 388 | for lang in $INST_LINGUAS; do | ||
404 | 389 | CATALOGS="$CATALOGS $lang.gmo" | ||
405 | 390 | JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" | ||
406 | 391 | QTCATALOGS="$QTCATALOGS $lang.qm" | ||
407 | 392 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | ||
408 | 393 | TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" | ||
409 | 394 | frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` | ||
410 | 395 | CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" | ||
411 | 396 | done | ||
412 | 397 | fi | ||
413 | 398 | |||
414 | 399 | sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" | ||
415 | 400 | if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then | ||
416 | 401 | # Add dependencies that cannot be formulated as a simple suffix rule. | ||
417 | 402 | for lang in $ALL_LINGUAS; do | ||
418 | 403 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | ||
419 | 404 | cat >> "$ac_file.tmp" <<EOF | ||
420 | 405 | $frobbedlang.msg: $lang.po | ||
421 | 406 | @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ | ||
422 | 407 | \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | ||
423 | 408 | EOF | ||
424 | 409 | done | ||
425 | 410 | fi | ||
426 | 411 | if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then | ||
427 | 412 | # Add dependencies that cannot be formulated as a simple suffix rule. | ||
428 | 413 | for lang in $ALL_LINGUAS; do | ||
429 | 414 | frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` | ||
430 | 415 | cat >> "$ac_file.tmp" <<EOF | ||
431 | 416 | $frobbedlang/\$(DOMAIN).resources.dll: $lang.po | ||
432 | 417 | @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ | ||
433 | 418 | \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | ||
434 | 419 | EOF | ||
435 | 420 | done | ||
436 | 421 | fi | ||
437 | 422 | if test -n "$POMAKEFILEDEPS"; then | ||
438 | 423 | cat >> "$ac_file.tmp" <<EOF | ||
439 | 424 | Makefile: $POMAKEFILEDEPS | ||
440 | 425 | EOF | ||
441 | 426 | fi | ||
442 | 427 | mv "$ac_file.tmp" "$ac_file" | ||
443 | 428 | ]) | ||
444 | 0 | 429 | ||
445 | === added directory '.pc/fix-autoreconf-warnings.patch/src' | |||
446 | === added file '.pc/fix-autoreconf-warnings.patch/src/Makefile.am' | |||
447 | --- .pc/fix-autoreconf-warnings.patch/src/Makefile.am 1970-01-01 00:00:00 +0000 | |||
448 | +++ .pc/fix-autoreconf-warnings.patch/src/Makefile.am 2014-03-26 02:58:34 +0000 | |||
449 | @@ -0,0 +1,191 @@ | |||
450 | 1 | AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" | ||
451 | 2 | LDADD = $(LIBINTL) | ||
452 | 3 | sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg | ||
453 | 4 | TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox | ||
454 | 5 | |||
455 | 6 | BTRFS_SOURCE= btrfs/crc32c.c btrfs/disk-io.c btrfs/extent-tree.c btrfs/inode-map.c btrfs/rbtree.c btrfs/volumes.c btrfs/ctree.c btrfs/extent-cache.c btrfs/file-item.c btrfs/print-tree.c btrfs/root-tree.c btrfs/dir-item.c btrfs/extent_io.c btrfs/inode-item.c btrfs/radix-tree.c btrfs/utils.c btrfs/crc32c.h btrfs/extent-cache.h btrfs/ioctl.h btrfs/print-tree.h btrfs/transaction.h btrfs/volumes.h btrfs/ctree.h btrfs/extent_io.h btrfs/kerncompat.h btrfs/radix-tree.h btrfs/utils.h btrfs/disk-io.h btrfs/hash.h btrfs/list.h btrfs/rbtree.h btrfs/version.h | ||
456 | 7 | |||
457 | 8 | EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h | ||
458 | 9 | |||
459 | 10 | if ENABLE_STATIC | ||
460 | 11 | LDFLAGS+=-static | ||
461 | 12 | endif | ||
462 | 13 | |||
463 | 14 | if ENABLE_TINFO | ||
464 | 15 | LIBS+=-ltinfo | ||
465 | 16 | endif | ||
466 | 17 | |||
467 | 18 | if ENABLE_MEMTRACE | ||
468 | 19 | CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO | ||
469 | 20 | endif | ||
470 | 21 | |||
471 | 22 | if ENABLE_NCURSESW | ||
472 | 23 | CFLAGS+=-I/usr/include/ncursesw | ||
473 | 24 | endif | ||
474 | 25 | |||
475 | 26 | version.h: FORCE | ||
476 | 27 | $(TOOLBOX) --update-version | ||
477 | 28 | |||
478 | 29 | partclone_info_SOURCES=infoclone.c partclone.c partclone.h fs_common.h | ||
479 | 30 | |||
480 | 31 | partclone_restore_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h restore.c | ||
481 | 32 | partclone_restore_CFLAGS=-DRESTORE | ||
482 | 33 | |||
483 | 34 | partclone_chkimg_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h chkimg.c | ||
484 | 35 | |||
485 | 36 | partclone_dd_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h ddclone.c | ||
486 | 37 | |||
487 | 38 | if ENABLE_EXTFS | ||
488 | 39 | sbin_PROGRAMS += partclone.extfs | ||
489 | 40 | partclone_extfs_SOURCES=main.c partclone.c progress.c extfsclone.c extfsclone.h partclone.h progress.h gettext.h | ||
490 | 41 | partclone_extfs_CFLAGS=-DEXTFS | ||
491 | 42 | partclone_extfs_LDADD=-lext2fs -lcom_err -lpthread | ||
492 | 43 | endif | ||
493 | 44 | |||
494 | 45 | if ENABLE_REISERFS | ||
495 | 46 | sbin_PROGRAMS += partclone.reiserfs | ||
496 | 47 | partclone_reiserfs_SOURCES=main.c partclone.c progress.c reiserfsclone.c reiserfsclone.h partclone.h progress.h gettext.h | ||
497 | 48 | partclone_reiserfs_CFLAGS=-DREISERFS | ||
498 | 49 | partclone_reiserfs_LDADD=-lreiserfs -ldal | ||
499 | 50 | endif | ||
500 | 51 | |||
501 | 52 | if ENABLE_REISER4 | ||
502 | 53 | sbin_PROGRAMS += partclone.reiser4 | ||
503 | 54 | partclone_reiser4_SOURCES=main.c partclone.c progress.c reiser4clone.c reiser4clone.h partclone.h progress.h gettext.h | ||
504 | 55 | partclone_reiser4_CFLAGS=-DREISER4 | ||
505 | 56 | partclone_reiser4_LDADD=-lreiser4 -laal | ||
506 | 57 | endif | ||
507 | 58 | |||
508 | 59 | if ENABLE_HFSP | ||
509 | 60 | sbin_PROGRAMS += partclone.hfsp | ||
510 | 61 | partclone_hfsp_SOURCES=main.c partclone.c progress.c hfsplusclone.c hfsplusclone.h partclone.h progress.h gettext.h | ||
511 | 62 | partclone_hfsp_CFLAGS=-DHFSPLUS | ||
512 | 63 | endif | ||
513 | 64 | |||
514 | 65 | if ENABLE_XFS | ||
515 | 66 | sbin_PROGRAMS += partclone.xfs | ||
516 | 67 | partclone_xfs_SOURCES=main.c partclone.c progress.c xfsclone.c xfsclone.h partclone.h progress.h gettext.h | ||
517 | 68 | partclone_xfs_CFLAGS=-DXFS -D_FILE_OFFSET_BITS=64 | ||
518 | 69 | partclone_xfs_LDFLAGS= | ||
519 | 70 | partclone_xfs_LDADD=-lxfs -lrt -lpthread | ||
520 | 71 | endif | ||
521 | 72 | |||
522 | 73 | if ENABLE_EXFAT | ||
523 | 74 | sbin_PROGRAMS += partclone.exfat | ||
524 | 75 | partclone_exfat_SOURCES=main.c partclone.c progress.c exfatclone.c exfatclone.h partclone.h progress.h gettext.h $(EXFATFS_SOURCE) | ||
525 | 76 | partclone_exfat_CFLAGS=-DEXFAT -D_FILE_OFFSET_BITS=64 | ||
526 | 77 | endif | ||
527 | 78 | |||
528 | 79 | if ENABLE_FAT | ||
529 | 80 | sbin_PROGRAMS += partclone.fat | ||
530 | 81 | partclone_fat_SOURCES=main.c partclone.c progress.c fatclone.c fatclone.h partclone.h progress.h gettext.h | ||
531 | 82 | partclone_fat_CFLAGS=-DFAT | ||
532 | 83 | endif | ||
533 | 84 | |||
534 | 85 | sbin_PROGRAMS += partclone.ntfsfixboot | ||
535 | 86 | partclone_ntfsfixboot_SOURCES=ntfsfixboot.c | ||
536 | 87 | if ENABLE_NTFS | ||
537 | 88 | sbin_PROGRAMS += partclone.ntfs | ||
538 | 89 | partclone_ntfs_SOURCES=main.c partclone.c progress.c ntfsclone-ng.c ntfsclone-ng.h partclone.h progress.h gettext.h | ||
539 | 90 | if ENABLE_NTFS_3G | ||
540 | 91 | partclone_ntfs_CFLAGS=-DNTFS3G | ||
541 | 92 | partclone_ntfs_LDADD=-lntfs-3g | ||
542 | 93 | else | ||
543 | 94 | partclone_ntfs_CFLAGS=-DNTFS | ||
544 | 95 | partclone_ntfs_LDADD=-lntfs | ||
545 | 96 | endif | ||
546 | 97 | endif | ||
547 | 98 | |||
548 | 99 | if ENABLE_UFS | ||
549 | 100 | sbin_PROGRAMS += partclone.ufs | ||
550 | 101 | partclone_ufs_SOURCES=main.c partclone.c progress.c ufsclone.c ufsclone.h partclone.h progress.h gettext.h | ||
551 | 102 | partclone_ufs_CFLAGS=-DUFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
552 | 103 | partclone_ufs_LDADD=-lufs -lbsd | ||
553 | 104 | endif | ||
554 | 105 | |||
555 | 106 | if ENABLE_VMFS | ||
556 | 107 | sbin_PROGRAMS += partclone.vmfs | ||
557 | 108 | partclone_vmfs_SOURCES=main.c partclone.c progress.c vmfsclone.c vmfsclone.h partclone.h progress.h gettext.h | ||
558 | 109 | partclone_vmfs_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS) | ||
559 | 110 | partclone_vmfs_LDADD=-lvmfs -luuid | ||
560 | 111 | |||
561 | 112 | sbin_PROGRAMS += partclone.vmfs5 | ||
562 | 113 | partclone_vmfs5_SOURCES=main.c partclone.c progress.c vmfs5clone.c vmfsclone.h partclone.h progress.h gettext.h | ||
563 | 114 | partclone_vmfs5_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS) | ||
564 | 115 | partclone_vmfs5_LDADD=-lvmfs -luuid | ||
565 | 116 | |||
566 | 117 | sbin_PROGRAMS += partclone.fstype | ||
567 | 118 | partclone_fstype_SOURCES=fstype.c | ||
568 | 119 | partclone_fstype_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS) | ||
569 | 120 | partclone_fstype_LDADD=-lvmfs -luuid | ||
570 | 121 | |||
571 | 122 | endif | ||
572 | 123 | |||
573 | 124 | if ENABLE_JFS | ||
574 | 125 | sbin_PROGRAMS += partclone.jfs | ||
575 | 126 | #partclone_jfs_SOURCES=main.c partclone.c progress.c jfs_devices.c jfs_devices.h jfsclone.c jfsclone.h partclone.h progress.h gettext.h | ||
576 | 127 | partclone_jfs_SOURCES=main.c partclone.c progress.c jfsclone.c jfsclone.h partclone.h progress.h gettext.h | ||
577 | 128 | partclone_jfs_CFLAGS=-DJFS | ||
578 | 129 | partclone_jfs_LDADD=-luuid -ljfs | ||
579 | 130 | endif | ||
580 | 131 | |||
581 | 132 | if ENABLE_BTRFS | ||
582 | 133 | sbin_PROGRAMS += partclone.btrfs | ||
583 | 134 | partclone_btrfs_SOURCES=main.c partclone.c progress.c btrfsclone.c btrfsclone.h partclone.h progress.h gettext.h $(BTRFS_SOURCE) | ||
584 | 135 | partclone_btrfs_CFLAGS=-DBTRFS -D_FILE_OFFSET_BITS=64 | ||
585 | 136 | partclone_btrfs_LDADD=-luuid | ||
586 | 137 | endif | ||
587 | 138 | |||
588 | 139 | # Extra | ||
589 | 140 | install-exec-hook: | ||
590 | 141 | if ENABLE_EXTFS | ||
591 | 142 | $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext2 | ||
592 | 143 | $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext3 | ||
593 | 144 | $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext4 | ||
594 | 145 | $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext4dev | ||
595 | 146 | endif | ||
596 | 147 | if ENABLE_HFSP | ||
597 | 148 | $(LN_S) -f partclone.hfsp $(DESTDIR)$(sbindir)/partclone.hfs+ | ||
598 | 149 | $(LN_S) -f partclone.hfsp $(DESTDIR)$(sbindir)/partclone.hfsplus | ||
599 | 150 | endif | ||
600 | 151 | if ENABLE_NTFS | ||
601 | 152 | $(LN_S) -f partclone.ntfsfixboot $(DESTDIR)$(sbindir)/partclone.ntfsreloc | ||
602 | 153 | endif | ||
603 | 154 | if ENABLE_FAT | ||
604 | 155 | $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat12 | ||
605 | 156 | $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat16 | ||
606 | 157 | $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat32 | ||
607 | 158 | $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.vfat | ||
608 | 159 | endif | ||
609 | 160 | if ENABLE_VMFS | ||
610 | 161 | $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.VMFS_volume_member | ||
611 | 162 | $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.vmfs3 | ||
612 | 163 | # $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.vmfs5 | ||
613 | 164 | endif | ||
614 | 165 | |||
615 | 166 | uninstall-local: | ||
616 | 167 | if ENABLE_EXTFS | ||
617 | 168 | $(RM) -f $(sbindir)/partclone.ext4dev | ||
618 | 169 | $(RM) -f $(sbindir)/partclone.ext4 | ||
619 | 170 | $(RM) -f $(sbindir)/partclone.ext3 | ||
620 | 171 | $(RM) -f $(sbindir)/partclone.ext2 | ||
621 | 172 | endif | ||
622 | 173 | if ENABLE_HFSP | ||
623 | 174 | $(RM) -f $(sbindir)/partclone.hfs+ | ||
624 | 175 | $(RM) -f $(sbindir)/partclone.hfsplus | ||
625 | 176 | endif | ||
626 | 177 | if ENABLE_FAT | ||
627 | 178 | $(RM) -f $(sbindir)/partclone.fat12 | ||
628 | 179 | $(RM) -f $(sbindir)/partclone.fat16 | ||
629 | 180 | $(RM) -f $(sbindir)/partclone.fat32 | ||
630 | 181 | $(RM) -f $(sbindir)/partclone.vfat | ||
631 | 182 | endif | ||
632 | 183 | if ENABLE_NTFS | ||
633 | 184 | $(RM) -f $(sbindir)/partclone.ntfsreloc | ||
634 | 185 | endif | ||
635 | 186 | |||
636 | 187 | if ENABLE_VMFS | ||
637 | 188 | $(RM) -f $(sbindir)/partclone.VMFS_volume_member | ||
638 | 189 | endif | ||
639 | 190 | |||
640 | 191 | FORCE: | ||
641 | 0 | 192 | ||
642 | === modified file 'debian/changelog' | |||
643 | --- debian/changelog 2013-05-30 15:12:54 +0000 | |||
644 | +++ debian/changelog 2014-03-26 02:58:34 +0000 | |||
645 | @@ -1,3 +1,10 @@ | |||
646 | 1 | partclone (0.2.51-1ubuntu3) UNRELEASED; urgency=medium | ||
647 | 2 | |||
648 | 3 | * Fix autoreconf warnings, currently treated as errors, causing | ||
649 | 4 | this package to FTBFS (LP: #1283294) | ||
650 | 5 | |||
651 | 6 | -- dann frazier <dann.frazier@canonical.com> Fri, 07 Mar 2014 15:14:44 -0700 | ||
652 | 7 | |||
653 | 1 | partclone (0.2.51-1ubuntu2) saucy; urgency=low | 8 | partclone (0.2.51-1ubuntu2) saucy; urgency=low |
654 | 2 | 9 | ||
655 | 3 | * Rebuild against ntfs-3g-841. | 10 | * Rebuild against ntfs-3g-841. |
656 | 4 | 11 | ||
657 | === added file 'debian/patches/fix-autoreconf-warnings.patch' | |||
658 | --- debian/patches/fix-autoreconf-warnings.patch 1970-01-01 00:00:00 +0000 | |||
659 | +++ debian/patches/fix-autoreconf-warnings.patch 2014-03-26 02:58:34 +0000 | |||
660 | @@ -0,0 +1,55 @@ | |||
661 | 1 | Description: Cleanup automake warnings | ||
662 | 2 | These warnings are treated as errors on Ubuntu, causing this package to FTBFS. | ||
663 | 3 | Author: Thomas Tsai <thomas@nchc.org.tw>, dann frazier <dann.frazier@canonical.com> | ||
664 | 4 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/partclone/+bug/1283294 | ||
665 | 5 | Applied-Upstream: https://github.com/Thomas-Tsai/partclone/commit/1809fffe1c94ec9bcf2cfabbd4220e9d5db79cbe, https://github.com/Thomas-Tsai/partclone/commit/e1aa90d14b556078eb14460516c963f259f81395 | ||
666 | 6 | |||
667 | 7 | Index: arm64-ftbfs/m4/po.m4 | ||
668 | 8 | =================================================================== | ||
669 | 9 | --- arm64-ftbfs.orig/m4/po.m4 2014-03-07 15:12:28.411951459 -0700 | ||
670 | 10 | +++ arm64-ftbfs/m4/po.m4 2014-03-07 15:13:43.020729078 -0700 | ||
671 | 11 | @@ -24,7 +24,7 @@ | ||
672 | 12 | [ | ||
673 | 13 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | ||
674 | 14 | AC_REQUIRE([AC_PROG_INSTALL])dnl | ||
675 | 15 | - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | ||
676 | 16 | + AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake | ||
677 | 17 | AC_REQUIRE([AM_NLS])dnl | ||
678 | 18 | |||
679 | 19 | dnl Perform the following tests also if --disable-nls has been given, | ||
680 | 20 | Index: arm64-ftbfs/src/Makefile.am | ||
681 | 21 | =================================================================== | ||
682 | 22 | --- arm64-ftbfs.orig/src/Makefile.am 2014-03-07 15:12:28.411951459 -0700 | ||
683 | 23 | +++ arm64-ftbfs/src/Makefile.am 2014-03-07 15:13:43.020729078 -0700 | ||
684 | 24 | @@ -1,3 +1,4 @@ | ||
685 | 25 | +AUTOMAKE_OPTIONS = subdir-objects | ||
686 | 26 | AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" | ||
687 | 27 | LDADD = $(LIBINTL) | ||
688 | 28 | sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg | ||
689 | 29 | @@ -7,8 +8,11 @@ | ||
690 | 30 | |||
691 | 31 | EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h | ||
692 | 32 | |||
693 | 33 | +AM_CFLAGS = | ||
694 | 34 | +AM_LDFLAGS = | ||
695 | 35 | + | ||
696 | 36 | if ENABLE_STATIC | ||
697 | 37 | -LDFLAGS+=-static | ||
698 | 38 | +AM_LDFLAGS+=-static | ||
699 | 39 | endif | ||
700 | 40 | |||
701 | 41 | if ENABLE_TINFO | ||
702 | 42 | @@ -16,11 +20,11 @@ | ||
703 | 43 | endif | ||
704 | 44 | |||
705 | 45 | if ENABLE_MEMTRACE | ||
706 | 46 | -CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO | ||
707 | 47 | +AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO | ||
708 | 48 | endif | ||
709 | 49 | |||
710 | 50 | if ENABLE_NCURSESW | ||
711 | 51 | -CFLAGS+=-I/usr/include/ncursesw | ||
712 | 52 | +AM_CFLAGS+=-I/usr/include/ncursesw | ||
713 | 53 | endif | ||
714 | 54 | |||
715 | 55 | version.h: FORCE | ||
716 | 0 | 56 | ||
717 | === modified file 'debian/patches/series' | |||
718 | --- debian/patches/series 2012-11-25 21:09:00 +0000 | |||
719 | +++ debian/patches/series 2014-03-26 02:58:34 +0000 | |||
720 | @@ -1,3 +1,4 @@ | |||
721 | 1 | 10-configure.ac.patch | 1 | 10-configure.ac.patch |
722 | 2 | 20-reiserfsclone.patch | 2 | 20-reiserfsclone.patch |
723 | 3 | upstream-translation-changes.patch | 3 | upstream-translation-changes.patch |
724 | 4 | fix-autoreconf-warnings.patch | ||
725 | 4 | 5 | ||
726 | === modified file 'm4/po.m4' | |||
727 | --- m4/po.m4 2011-06-28 17:18:39 +0000 | |||
728 | +++ m4/po.m4 2014-03-26 02:58:34 +0000 | |||
729 | @@ -24,7 +24,7 @@ | |||
730 | 24 | [ | 24 | [ |
731 | 25 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | 25 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
732 | 26 | AC_REQUIRE([AC_PROG_INSTALL])dnl | 26 | AC_REQUIRE([AC_PROG_INSTALL])dnl |
734 | 27 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | 27 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake |
735 | 28 | AC_REQUIRE([AM_NLS])dnl | 28 | AC_REQUIRE([AM_NLS])dnl |
736 | 29 | 29 | ||
737 | 30 | dnl Perform the following tests also if --disable-nls has been given, | 30 | dnl Perform the following tests also if --disable-nls has been given, |
738 | 31 | 31 | ||
739 | === modified file 'src/Makefile.am' | |||
740 | --- src/Makefile.am 2012-08-19 10:15:44 +0000 | |||
741 | +++ src/Makefile.am 2014-03-26 02:58:34 +0000 | |||
742 | @@ -1,3 +1,4 @@ | |||
743 | 1 | AUTOMAKE_OPTIONS = subdir-objects | ||
744 | 1 | AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" | 2 | AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" |
745 | 2 | LDADD = $(LIBINTL) | 3 | LDADD = $(LIBINTL) |
746 | 3 | sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg | 4 | sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg |
747 | @@ -7,8 +8,11 @@ | |||
748 | 7 | 8 | ||
749 | 8 | EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h | 9 | EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h |
750 | 9 | 10 | ||
751 | 11 | AM_CFLAGS = | ||
752 | 12 | AM_LDFLAGS = | ||
753 | 13 | |||
754 | 10 | if ENABLE_STATIC | 14 | if ENABLE_STATIC |
756 | 11 | LDFLAGS+=-static | 15 | AM_LDFLAGS+=-static |
757 | 12 | endif | 16 | endif |
758 | 13 | 17 | ||
759 | 14 | if ENABLE_TINFO | 18 | if ENABLE_TINFO |
760 | @@ -16,11 +20,11 @@ | |||
761 | 16 | endif | 20 | endif |
762 | 17 | 21 | ||
763 | 18 | if ENABLE_MEMTRACE | 22 | if ENABLE_MEMTRACE |
765 | 19 | CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO | 23 | AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO |
766 | 20 | endif | 24 | endif |
767 | 21 | 25 | ||
768 | 22 | if ENABLE_NCURSESW | 26 | if ENABLE_NCURSESW |
770 | 23 | CFLAGS+=-I/usr/include/ncursesw | 27 | AM_CFLAGS+=-I/usr/include/ncursesw |
771 | 24 | endif | 28 | endif |
772 | 25 | 29 | ||
773 | 26 | version.h: FORCE | 30 | version.h: FORCE |
Thanks for the work. Would it make sense to foward that fix to Debian as well?