Merge lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs into lp:ubuntu/trusty/partclone

Proposed by dann frazier
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
Reviewer Review Type Date Requested Status
dann frazier Needs Resubmitting
Marc Deslauriers Needs Fixing
Review via email: mp+207755@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work. Would it make sense to foward that fix to Debian as well?

Revision history for this message
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.

Revision history for this message
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!

review: Needs Fixing
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

Revision history for this message
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.

review: Needs Resubmitting
22. By dann frazier

Patches accepted upstream, update DEP-3 headers

Revision history for this message
dann frazier (dannf) wrote :

fyi, patches now accepted upstream. dep-3 headers updated.

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2012-11-25 21:09:00 +0000
+++ .pc/applied-patches 2014-03-26 02:58:34 +0000
@@ -1,3 +1,4 @@
110-configure.ac.patch110-configure.ac.patch
220-reiserfsclone.patch220-reiserfsclone.patch
3upstream-translation-changes.patch3upstream-translation-changes.patch
4fix-autoreconf-warnings.patch
45
=== added directory '.pc/fix-autoreconf-warnings.patch'
=== added directory '.pc/fix-autoreconf-warnings.patch/m4'
=== added file '.pc/fix-autoreconf-warnings.patch/m4/po.m4'
--- .pc/fix-autoreconf-warnings.patch/m4/po.m4 1970-01-01 00:00:00 +0000
+++ .pc/fix-autoreconf-warnings.patch/m4/po.m4 2014-03-26 02:58:34 +0000
@@ -0,0 +1,428 @@
1# po.m4 serial 13 (gettext-0.15)
2dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19
20AC_PREREQ(2.50)
21
22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS],
24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
28 AC_REQUIRE([AM_NLS])dnl
29
30 dnl Perform the following tests also if --disable-nls has been given,
31 dnl because they are needed for "make dist" to work.
32
33 dnl Search for GNU msgfmt in the PATH.
34 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
35 dnl The second test excludes FreeBSD msgfmt.
36 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
37 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
38 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
39 :)
40 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
41
42 dnl Test whether it is GNU msgfmt >= 0.15.
43changequote(,)dnl
44 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
45 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
46 *) MSGFMT_015=$MSGFMT ;;
47 esac
48changequote([,])dnl
49 AC_SUBST([MSGFMT_015])
50changequote(,)dnl
51 case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
52 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
53 *) GMSGFMT_015=$GMSGFMT ;;
54 esac
55changequote([,])dnl
56 AC_SUBST([GMSGFMT_015])
57
58 dnl Search for GNU xgettext 0.12 or newer in the PATH.
59 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
60 dnl The second test excludes FreeBSD xgettext.
61 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
62 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
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)],
64 :)
65 dnl Remove leftover from FreeBSD xgettext call.
66 rm -f messages.po
67
68 dnl Test whether it is GNU xgettext >= 0.15.
69changequote(,)dnl
70 case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
71 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
72 *) XGETTEXT_015=$XGETTEXT ;;
73 esac
74changequote([,])dnl
75 AC_SUBST([XGETTEXT_015])
76
77 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
78 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
79 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
80
81 dnl Installation directories.
82 dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
83 dnl have to define it here, so that it can be used in po/Makefile.
84 test -n "$localedir" || localedir='${datadir}/locale'
85 AC_SUBST([localedir])
86
87 AC_CONFIG_COMMANDS([po-directories], [[
88 for ac_file in $CONFIG_FILES; do
89 # Support "outfile[:infile[:infile...]]"
90 case "$ac_file" in
91 *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
92 esac
93 # PO directories have a Makefile.in generated from Makefile.in.in.
94 case "$ac_file" in */Makefile.in)
95 # Adjust a relative srcdir.
96 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
97 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
98 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
99 # In autoconf-2.13 it is called $ac_given_srcdir.
100 # In autoconf-2.50 it is called $srcdir.
101 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
102 case "$ac_given_srcdir" in
103 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
104 /*) top_srcdir="$ac_given_srcdir" ;;
105 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
106 esac
107 # Treat a directory as a PO directory if and only if it has a
108 # POTFILES.in file. This allows packages to have multiple PO
109 # directories under different names or in different locations.
110 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
111 rm -f "$ac_dir/POTFILES"
112 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
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"
114 POMAKEFILEDEPS="POTFILES.in"
115 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
116 # on $ac_dir but don't depend on user-specified configuration
117 # parameters.
118 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
119 # The LINGUAS file contains the set of available languages.
120 if test -n "$OBSOLETE_ALL_LINGUAS"; then
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"
122 fi
123 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
124 # Hide the ALL_LINGUAS assigment from automake < 1.5.
125 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
126 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
127 else
128 # The set of available languages was given in configure.in.
129 # Hide the ALL_LINGUAS assigment from automake < 1.5.
130 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
131 fi
132 # Compute POFILES
133 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
134 # Compute UPDATEPOFILES
135 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
136 # Compute DUMMYPOFILES
137 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
138 # Compute GMOFILES
139 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
140 case "$ac_given_srcdir" in
141 .) srcdirpre= ;;
142 *) srcdirpre='$(srcdir)/' ;;
143 esac
144 POFILES=
145 UPDATEPOFILES=
146 DUMMYPOFILES=
147 GMOFILES=
148 for lang in $ALL_LINGUAS; do
149 POFILES="$POFILES $srcdirpre$lang.po"
150 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
151 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
152 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
153 done
154 # CATALOGS depends on both $ac_dir and the user's LINGUAS
155 # environment variable.
156 INST_LINGUAS=
157 if test -n "$ALL_LINGUAS"; then
158 for presentlang in $ALL_LINGUAS; do
159 useit=no
160 if test "%UNSET%" != "$LINGUAS"; then
161 desiredlanguages="$LINGUAS"
162 else
163 desiredlanguages="$ALL_LINGUAS"
164 fi
165 for desiredlang in $desiredlanguages; do
166 # Use the presentlang catalog if desiredlang is
167 # a. equal to presentlang, or
168 # b. a variant of presentlang (because in this case,
169 # presentlang can be used as a fallback for messages
170 # which are not translated in the desiredlang catalog).
171 case "$desiredlang" in
172 "$presentlang"*) useit=yes;;
173 esac
174 done
175 if test $useit = yes; then
176 INST_LINGUAS="$INST_LINGUAS $presentlang"
177 fi
178 done
179 fi
180 CATALOGS=
181 if test -n "$INST_LINGUAS"; then
182 for lang in $INST_LINGUAS; do
183 CATALOGS="$CATALOGS $lang.gmo"
184 done
185 fi
186 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
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"
188 for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
189 if test -f "$f"; then
190 case "$f" in
191 *.orig | *.bak | *~) ;;
192 *) cat "$f" >> "$ac_dir/Makefile" ;;
193 esac
194 fi
195 done
196 fi
197 ;;
198 esac
199 done]],
200 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
201 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
202 # from automake < 1.5.
203 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
204 # Capture the value of LINGUAS because we need it to compute CATALOGS.
205 LINGUAS="${LINGUAS-%UNSET%}"
206 ])
207])
208
209dnl Postprocesses a Makefile in a directory containing PO files.
210AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
211[
212 # When this code is run, in config.status, two variables have already been
213 # set:
214 # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
215 # - LINGUAS is the value of the environment variable LINGUAS at configure
216 # time.
217
218changequote(,)dnl
219 # Adjust a relative srcdir.
220 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
221 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
222 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
223 # In autoconf-2.13 it is called $ac_given_srcdir.
224 # In autoconf-2.50 it is called $srcdir.
225 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
226 case "$ac_given_srcdir" in
227 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
228 /*) top_srcdir="$ac_given_srcdir" ;;
229 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
230 esac
231
232 # Find a way to echo strings without interpreting backslash.
233 if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
234 gt_echo='echo'
235 else
236 if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
237 gt_echo='printf %s\n'
238 else
239 echo_func () {
240 cat <<EOT
241$*
242EOT
243 }
244 gt_echo='echo_func'
245 fi
246 fi
247
248 # A sed script that extracts the value of VARIABLE from a Makefile.
249 sed_x_variable='
250# Test if the hold space is empty.
251x
252s/P/P/
253x
254ta
255# Yes it was empty. Look if we have the expected variable definition.
256/^[ ]*VARIABLE[ ]*=/{
257 # Seen the first line of the variable definition.
258 s/^[ ]*VARIABLE[ ]*=//
259 ba
260}
261bd
262:a
263# Here we are processing a line from the variable definition.
264# Remove comment, more precisely replace it with a space.
265s/#.*$/ /
266# See if the line ends in a backslash.
267tb
268:b
269s/\\$//
270# Print the line, without the trailing backslash.
271p
272tc
273# There was no trailing backslash. The end of the variable definition is
274# reached. Clear the hold space.
275s/^.*$//
276x
277bd
278:c
279# A trailing backslash means that the variable definition continues in the
280# next line. Put a nonempty string into the hold space to indicate this.
281s/^.*$/P/
282x
283:d
284'
285changequote([,])dnl
286
287 # Set POTFILES to the value of the Makefile variable POTFILES.
288 sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
289 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
290 # Compute POTFILES_DEPS as
291 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
292 POTFILES_DEPS=
293 for file in $POTFILES; do
294 POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
295 done
296 POMAKEFILEDEPS=""
297
298 if test -n "$OBSOLETE_ALL_LINGUAS"; then
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"
300 fi
301 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
302 # The LINGUAS file contains the set of available languages.
303 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
304 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
305 else
306 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
307 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
308 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
309 fi
310 # Hide the ALL_LINGUAS assigment from automake < 1.5.
311 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
312 # Compute POFILES
313 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
314 # Compute UPDATEPOFILES
315 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
316 # Compute DUMMYPOFILES
317 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
318 # Compute GMOFILES
319 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
320 # Compute PROPERTIESFILES
321 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
322 # Compute CLASSFILES
323 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
324 # Compute QMFILES
325 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
326 # Compute MSGFILES
327 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
328 # Compute RESOURCESDLLFILES
329 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
330 case "$ac_given_srcdir" in
331 .) srcdirpre= ;;
332 *) srcdirpre='$(srcdir)/' ;;
333 esac
334 POFILES=
335 UPDATEPOFILES=
336 DUMMYPOFILES=
337 GMOFILES=
338 PROPERTIESFILES=
339 CLASSFILES=
340 QMFILES=
341 MSGFILES=
342 RESOURCESDLLFILES=
343 for lang in $ALL_LINGUAS; do
344 POFILES="$POFILES $srcdirpre$lang.po"
345 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
346 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
347 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
348 PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
349 CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
350 QMFILES="$QMFILES $srcdirpre$lang.qm"
351 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
352 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
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/'`
354 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
355 done
356 # CATALOGS depends on both $ac_dir and the user's LINGUAS
357 # environment variable.
358 INST_LINGUAS=
359 if test -n "$ALL_LINGUAS"; then
360 for presentlang in $ALL_LINGUAS; do
361 useit=no
362 if test "%UNSET%" != "$LINGUAS"; then
363 desiredlanguages="$LINGUAS"
364 else
365 desiredlanguages="$ALL_LINGUAS"
366 fi
367 for desiredlang in $desiredlanguages; do
368 # Use the presentlang catalog if desiredlang is
369 # a. equal to presentlang, or
370 # b. a variant of presentlang (because in this case,
371 # presentlang can be used as a fallback for messages
372 # which are not translated in the desiredlang catalog).
373 case "$desiredlang" in
374 "$presentlang"*) useit=yes;;
375 esac
376 done
377 if test $useit = yes; then
378 INST_LINGUAS="$INST_LINGUAS $presentlang"
379 fi
380 done
381 fi
382 CATALOGS=
383 JAVACATALOGS=
384 QTCATALOGS=
385 TCLCATALOGS=
386 CSHARPCATALOGS=
387 if test -n "$INST_LINGUAS"; then
388 for lang in $INST_LINGUAS; do
389 CATALOGS="$CATALOGS $lang.gmo"
390 JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
391 QTCATALOGS="$QTCATALOGS $lang.qm"
392 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
393 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
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/'`
395 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
396 done
397 fi
398
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"
400 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
401 # Add dependencies that cannot be formulated as a simple suffix rule.
402 for lang in $ALL_LINGUAS; do
403 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
404 cat >> "$ac_file.tmp" <<EOF
405$frobbedlang.msg: $lang.po
406 @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
407 \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
408EOF
409 done
410 fi
411 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
412 # Add dependencies that cannot be formulated as a simple suffix rule.
413 for lang in $ALL_LINGUAS; do
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/'`
415 cat >> "$ac_file.tmp" <<EOF
416$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
417 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
418 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
419EOF
420 done
421 fi
422 if test -n "$POMAKEFILEDEPS"; then
423 cat >> "$ac_file.tmp" <<EOF
424Makefile: $POMAKEFILEDEPS
425EOF
426 fi
427 mv "$ac_file.tmp" "$ac_file"
428])
0429
=== added directory '.pc/fix-autoreconf-warnings.patch/src'
=== added file '.pc/fix-autoreconf-warnings.patch/src/Makefile.am'
--- .pc/fix-autoreconf-warnings.patch/src/Makefile.am 1970-01-01 00:00:00 +0000
+++ .pc/fix-autoreconf-warnings.patch/src/Makefile.am 2014-03-26 02:58:34 +0000
@@ -0,0 +1,191 @@
1AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
2LDADD = $(LIBINTL)
3sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg
4TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
5
6BTRFS_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
7
8EXFATFS_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
10if ENABLE_STATIC
11LDFLAGS+=-static
12endif
13
14if ENABLE_TINFO
15LIBS+=-ltinfo
16endif
17
18if ENABLE_MEMTRACE
19CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
20endif
21
22if ENABLE_NCURSESW
23CFLAGS+=-I/usr/include/ncursesw
24endif
25
26version.h: FORCE
27 $(TOOLBOX) --update-version
28
29partclone_info_SOURCES=infoclone.c partclone.c partclone.h fs_common.h
30
31partclone_restore_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h restore.c
32partclone_restore_CFLAGS=-DRESTORE
33
34partclone_chkimg_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h chkimg.c
35
36partclone_dd_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h ddclone.c
37
38if ENABLE_EXTFS
39sbin_PROGRAMS += partclone.extfs
40partclone_extfs_SOURCES=main.c partclone.c progress.c extfsclone.c extfsclone.h partclone.h progress.h gettext.h
41partclone_extfs_CFLAGS=-DEXTFS
42partclone_extfs_LDADD=-lext2fs -lcom_err -lpthread
43endif
44
45if ENABLE_REISERFS
46sbin_PROGRAMS += partclone.reiserfs
47partclone_reiserfs_SOURCES=main.c partclone.c progress.c reiserfsclone.c reiserfsclone.h partclone.h progress.h gettext.h
48partclone_reiserfs_CFLAGS=-DREISERFS
49partclone_reiserfs_LDADD=-lreiserfs -ldal
50endif
51
52if ENABLE_REISER4
53sbin_PROGRAMS += partclone.reiser4
54partclone_reiser4_SOURCES=main.c partclone.c progress.c reiser4clone.c reiser4clone.h partclone.h progress.h gettext.h
55partclone_reiser4_CFLAGS=-DREISER4
56partclone_reiser4_LDADD=-lreiser4 -laal
57endif
58
59if ENABLE_HFSP
60sbin_PROGRAMS += partclone.hfsp
61partclone_hfsp_SOURCES=main.c partclone.c progress.c hfsplusclone.c hfsplusclone.h partclone.h progress.h gettext.h
62partclone_hfsp_CFLAGS=-DHFSPLUS
63endif
64
65if ENABLE_XFS
66sbin_PROGRAMS += partclone.xfs
67partclone_xfs_SOURCES=main.c partclone.c progress.c xfsclone.c xfsclone.h partclone.h progress.h gettext.h
68partclone_xfs_CFLAGS=-DXFS -D_FILE_OFFSET_BITS=64
69partclone_xfs_LDFLAGS=
70partclone_xfs_LDADD=-lxfs -lrt -lpthread
71endif
72
73if ENABLE_EXFAT
74sbin_PROGRAMS += partclone.exfat
75partclone_exfat_SOURCES=main.c partclone.c progress.c exfatclone.c exfatclone.h partclone.h progress.h gettext.h $(EXFATFS_SOURCE)
76partclone_exfat_CFLAGS=-DEXFAT -D_FILE_OFFSET_BITS=64
77endif
78
79if ENABLE_FAT
80sbin_PROGRAMS += partclone.fat
81partclone_fat_SOURCES=main.c partclone.c progress.c fatclone.c fatclone.h partclone.h progress.h gettext.h
82partclone_fat_CFLAGS=-DFAT
83endif
84
85sbin_PROGRAMS += partclone.ntfsfixboot
86partclone_ntfsfixboot_SOURCES=ntfsfixboot.c
87if ENABLE_NTFS
88sbin_PROGRAMS += partclone.ntfs
89partclone_ntfs_SOURCES=main.c partclone.c progress.c ntfsclone-ng.c ntfsclone-ng.h partclone.h progress.h gettext.h
90if ENABLE_NTFS_3G
91partclone_ntfs_CFLAGS=-DNTFS3G
92partclone_ntfs_LDADD=-lntfs-3g
93else
94partclone_ntfs_CFLAGS=-DNTFS
95partclone_ntfs_LDADD=-lntfs
96endif
97endif
98
99if ENABLE_UFS
100sbin_PROGRAMS += partclone.ufs
101partclone_ufs_SOURCES=main.c partclone.c progress.c ufsclone.c ufsclone.h partclone.h progress.h gettext.h
102partclone_ufs_CFLAGS=-DUFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
103partclone_ufs_LDADD=-lufs -lbsd
104endif
105
106if ENABLE_VMFS
107sbin_PROGRAMS += partclone.vmfs
108partclone_vmfs_SOURCES=main.c partclone.c progress.c vmfsclone.c vmfsclone.h partclone.h progress.h gettext.h
109partclone_vmfs_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS)
110partclone_vmfs_LDADD=-lvmfs -luuid
111
112sbin_PROGRAMS += partclone.vmfs5
113partclone_vmfs5_SOURCES=main.c partclone.c progress.c vmfs5clone.c vmfsclone.h partclone.h progress.h gettext.h
114partclone_vmfs5_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS)
115partclone_vmfs5_LDADD=-lvmfs -luuid
116
117sbin_PROGRAMS += partclone.fstype
118partclone_fstype_SOURCES=fstype.c
119partclone_fstype_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS)
120partclone_fstype_LDADD=-lvmfs -luuid
121
122endif
123
124if ENABLE_JFS
125sbin_PROGRAMS += partclone.jfs
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
127partclone_jfs_SOURCES=main.c partclone.c progress.c jfsclone.c jfsclone.h partclone.h progress.h gettext.h
128partclone_jfs_CFLAGS=-DJFS
129partclone_jfs_LDADD=-luuid -ljfs
130endif
131
132if ENABLE_BTRFS
133sbin_PROGRAMS += partclone.btrfs
134partclone_btrfs_SOURCES=main.c partclone.c progress.c btrfsclone.c btrfsclone.h partclone.h progress.h gettext.h $(BTRFS_SOURCE)
135partclone_btrfs_CFLAGS=-DBTRFS -D_FILE_OFFSET_BITS=64
136partclone_btrfs_LDADD=-luuid
137endif
138
139# Extra
140install-exec-hook:
141if ENABLE_EXTFS
142 $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext2
143 $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext3
144 $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext4
145 $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext4dev
146endif
147if ENABLE_HFSP
148 $(LN_S) -f partclone.hfsp $(DESTDIR)$(sbindir)/partclone.hfs+
149 $(LN_S) -f partclone.hfsp $(DESTDIR)$(sbindir)/partclone.hfsplus
150endif
151if ENABLE_NTFS
152 $(LN_S) -f partclone.ntfsfixboot $(DESTDIR)$(sbindir)/partclone.ntfsreloc
153endif
154if ENABLE_FAT
155 $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat12
156 $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat16
157 $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat32
158 $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.vfat
159endif
160if ENABLE_VMFS
161 $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.VMFS_volume_member
162 $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.vmfs3
163# $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.vmfs5
164endif
165
166uninstall-local:
167if ENABLE_EXTFS
168 $(RM) -f $(sbindir)/partclone.ext4dev
169 $(RM) -f $(sbindir)/partclone.ext4
170 $(RM) -f $(sbindir)/partclone.ext3
171 $(RM) -f $(sbindir)/partclone.ext2
172endif
173if ENABLE_HFSP
174 $(RM) -f $(sbindir)/partclone.hfs+
175 $(RM) -f $(sbindir)/partclone.hfsplus
176endif
177if ENABLE_FAT
178 $(RM) -f $(sbindir)/partclone.fat12
179 $(RM) -f $(sbindir)/partclone.fat16
180 $(RM) -f $(sbindir)/partclone.fat32
181 $(RM) -f $(sbindir)/partclone.vfat
182endif
183if ENABLE_NTFS
184 $(RM) -f $(sbindir)/partclone.ntfsreloc
185endif
186
187if ENABLE_VMFS
188 $(RM) -f $(sbindir)/partclone.VMFS_volume_member
189endif
190
191FORCE:
0192
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-30 15:12:54 +0000
+++ debian/changelog 2014-03-26 02:58:34 +0000
@@ -1,3 +1,10 @@
1partclone (0.2.51-1ubuntu3) UNRELEASED; urgency=medium
2
3 * Fix autoreconf warnings, currently treated as errors, causing
4 this package to FTBFS (LP: #1283294)
5
6 -- dann frazier <dann.frazier@canonical.com> Fri, 07 Mar 2014 15:14:44 -0700
7
1partclone (0.2.51-1ubuntu2) saucy; urgency=low8partclone (0.2.51-1ubuntu2) saucy; urgency=low
29
3 * Rebuild against ntfs-3g-841.10 * Rebuild against ntfs-3g-841.
411
=== added file 'debian/patches/fix-autoreconf-warnings.patch'
--- debian/patches/fix-autoreconf-warnings.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-autoreconf-warnings.patch 2014-03-26 02:58:34 +0000
@@ -0,0 +1,55 @@
1Description: Cleanup automake warnings
2 These warnings are treated as errors on Ubuntu, causing this package to FTBFS.
3Author: Thomas Tsai <thomas@nchc.org.tw>, dann frazier <dann.frazier@canonical.com>
4Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/partclone/+bug/1283294
5Applied-Upstream: https://github.com/Thomas-Tsai/partclone/commit/1809fffe1c94ec9bcf2cfabbd4220e9d5db79cbe, https://github.com/Thomas-Tsai/partclone/commit/e1aa90d14b556078eb14460516c963f259f81395
6
7Index: arm64-ftbfs/m4/po.m4
8===================================================================
9--- arm64-ftbfs.orig/m4/po.m4 2014-03-07 15:12:28.411951459 -0700
10+++ arm64-ftbfs/m4/po.m4 2014-03-07 15:13:43.020729078 -0700
11@@ -24,7 +24,7 @@
12 [
13 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
14 AC_REQUIRE([AC_PROG_INSTALL])dnl
15- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
16+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
17 AC_REQUIRE([AM_NLS])dnl
18
19 dnl Perform the following tests also if --disable-nls has been given,
20Index: arm64-ftbfs/src/Makefile.am
21===================================================================
22--- arm64-ftbfs.orig/src/Makefile.am 2014-03-07 15:12:28.411951459 -0700
23+++ arm64-ftbfs/src/Makefile.am 2014-03-07 15:13:43.020729078 -0700
24@@ -1,3 +1,4 @@
25+AUTOMAKE_OPTIONS = subdir-objects
26 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
27 LDADD = $(LIBINTL)
28 sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg
29@@ -7,8 +8,11 @@
30
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
32
33+AM_CFLAGS =
34+AM_LDFLAGS =
35+
36 if ENABLE_STATIC
37-LDFLAGS+=-static
38+AM_LDFLAGS+=-static
39 endif
40
41 if ENABLE_TINFO
42@@ -16,11 +20,11 @@
43 endif
44
45 if ENABLE_MEMTRACE
46-CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
47+AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
48 endif
49
50 if ENABLE_NCURSESW
51-CFLAGS+=-I/usr/include/ncursesw
52+AM_CFLAGS+=-I/usr/include/ncursesw
53 endif
54
55 version.h: FORCE
056
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-11-25 21:09:00 +0000
+++ debian/patches/series 2014-03-26 02:58:34 +0000
@@ -1,3 +1,4 @@
110-configure.ac.patch110-configure.ac.patch
220-reiserfsclone.patch220-reiserfsclone.patch
3upstream-translation-changes.patch3upstream-translation-changes.patch
4fix-autoreconf-warnings.patch
45
=== modified file 'm4/po.m4'
--- m4/po.m4 2011-06-28 17:18:39 +0000
+++ m4/po.m4 2014-03-26 02:58:34 +0000
@@ -24,7 +24,7 @@
24[24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake27 AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
28 AC_REQUIRE([AM_NLS])dnl28 AC_REQUIRE([AM_NLS])dnl
2929
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,
3131
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-08-19 10:15:44 +0000
+++ src/Makefile.am 2014-03-26 02:58:34 +0000
@@ -1,3 +1,4 @@
1AUTOMAKE_OPTIONS = subdir-objects
1AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"2AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
2LDADD = $(LIBINTL)3LDADD = $(LIBINTL)
3sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg4sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg
@@ -7,8 +8,11 @@
78
8EXFATFS_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.h9EXFATFS_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
910
11AM_CFLAGS =
12AM_LDFLAGS =
13
10if ENABLE_STATIC14if ENABLE_STATIC
11LDFLAGS+=-static 15AM_LDFLAGS+=-static
12endif16endif
1317
14if ENABLE_TINFO18if ENABLE_TINFO
@@ -16,11 +20,11 @@
16endif20endif
1721
18if ENABLE_MEMTRACE22if ENABLE_MEMTRACE
19CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO23AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
20endif24endif
2125
22if ENABLE_NCURSESW26if ENABLE_NCURSESW
23CFLAGS+=-I/usr/include/ncursesw27AM_CFLAGS+=-I/usr/include/ncursesw
24endif28endif
2529
26version.h: FORCE30version.h: FORCE

Subscribers

People subscribed via source and target branches

to all changes: