Exclude files in POTFILES.skip from the POTFILES.in generated

by the script generate_POTFILES.sh.

Fixes make distcheck on Ubuntu.

(bzr r13278)

2 files changed, 29 insertions, 41 deletions

diff --git a/generate_POTFILES.sh b/generate_POTFILES.sh
index b3da403a1..04ea931b5 100755
--- a/generate_POTFILES.sh
+++ b/generate_POTFILES.sh
@@ -14,6 +14,9 @@ fi
 rm -f po/POTFILES.in.new
 
 (
+ # enforce consistent sort order and date format
+ export LC_ALL=C
+
  echo "# List of source files containing translatable strings."
  echo "# Please keep this file sorted alphabetically."
  echo "# Generated by $prog at `date`"
@@ -29,7 +32,10 @@ rm -f po/POTFILES.in.new
  find src \( -name '*.cpp' -o -name '*.[ch]' \) -type f -print0 | xargs -0 egrep -l '(\<[QNC]?_|gettext) *\(' | sort
  find share/extensions -name '*.py' -type f -print0 | xargs -0 egrep -l '(\<[QNC]?_|gettext) *\(' | sort
  find share/extensions -name '*.inx' -type f -print | sort | sed 's%^%[type: gettext/xml] %'
-) > po/POTFILES.in.new
+
+ #do not include files from POTFILES.skip in the generated list
+) | grep -vx -f po/POTFILES.skip > po/POTFILES.in.new
+
 
 diff -q po/POTFILES.in po/POTFILES.in.new ||:
 mv po/POTFILES.in.new po/POTFILES.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 082321236..c5db82770 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-# Generated by ./generate_POTFILES.sh at Thu Apr  3 00:36:24 CEST 2014
+# Generated by ./generate_POTFILES.sh at Thu Apr 10 00:15:41 CEST 2014
 [encoding: UTF-8]
 inkscape.desktop.in
 share/filters/filters.svg.h
@@ -11,8 +11,8 @@ share/templates/templates.h
 src/box3d.cpp
 src/color-profile.cpp
 src/context-fns.cpp
-src/desktop.cpp
 src/desktop-events.cpp
+src/desktop.cpp
 src/display/canvas-axonomgrid.cpp
 src/display/canvas-grid.cpp
 src/display/snap-indicator.cpp
@@ -42,8 +42,8 @@ src/extension/internal/bitmap/enhance.cpp
 src/extension/internal/bitmap/equalize.cpp
 src/extension/internal/bitmap/gaussianBlur.cpp
 src/extension/internal/bitmap/implode.cpp
-src/extension/internal/bitmap/levelChannel.cpp
 src/extension/internal/bitmap/level.cpp
+src/extension/internal/bitmap/levelChannel.cpp
 src/extension/internal/bitmap/medianFilter.cpp
 src/extension/internal/bitmap/modulate.cpp
 src/extension/internal/bitmap/negate.cpp
@@ -72,8 +72,8 @@ src/extension/internal/filter/blurs.h
 src/extension/internal/filter/bumps.h
 src/extension/internal/filter/color.h
 src/extension/internal/filter/distort.h
-src/extension/internal/filter/filter.cpp
 src/extension/internal/filter/filter-file.cpp
+src/extension/internal/filter/filter.cpp
 src/extension/internal/filter/image.h
 src/extension/internal/filter/morphology.h
 src/extension/internal/filter/overlays.h
@@ -86,8 +86,8 @@ src/extension/internal/gdkpixbuf-input.cpp
 src/extension/internal/gimpgrad.cpp
 src/extension/internal/grid.cpp
 src/extension/internal/javafx-out.cpp
-src/extension/internal/latex-pstricks.cpp
 src/extension/internal/latex-pstricks-out.cpp
+src/extension/internal/latex-pstricks.cpp
 src/extension/internal/odf.cpp
 src/extension/internal/pdf-input-cairo.cpp
 src/extension/internal/pdfinput/pdf-input.cpp
@@ -116,52 +116,34 @@ src/interface.cpp
 src/knot.cpp
 src/knotholder.cpp
 src/libgdl/gdl-dock-bar.c
-src/libgdl/gdl-dock.c
-src/libgdl/gdl-dock-item.c
 src/libgdl/gdl-dock-item-grip.c
+src/libgdl/gdl-dock-item.c
 src/libgdl/gdl-dock-master.c
 src/libgdl/gdl-dock-notebook.c
 src/libgdl/gdl-dock-object.c
 src/libgdl/gdl-dock-paned.c
 src/libgdl/gdl-dock-placeholder.c
 src/libgdl/gdl-dock-tablabel.c
+src/libgdl/gdl-dock.c
 src/libgdl/gdl-i18n.c
 src/libgdl/gdl-i18n.h
 src/libgdl/gdl-switcher.c
 src/libnrtype/FontFactory.cpp
 src/live_effects/effect.cpp
-src/live_effects/lpe-angle_bisector.cpp
 src/live_effects/lpe-bendpath.cpp
-src/live_effects/lpe-boolops.cpp
-src/live_effects/lpe-circle_with_radius.cpp
 src/live_effects/lpe-clone-original.cpp
 src/live_effects/lpe-constructgrid.cpp
-src/live_effects/lpe-copy_rotate.cpp
 src/live_effects/lpe-curvestitch.cpp
-src/live_effects/lpe-dynastroke.cpp
 src/live_effects/lpe-envelope.cpp
 src/live_effects/lpe-extrude.cpp
 src/live_effects/lpe-gears.cpp
 src/live_effects/lpe-interpolate.cpp
 src/live_effects/lpe-knot.cpp
-src/live_effects/lpe-lattice.cpp
-src/live_effects/lpe-line_segment.cpp
-src/live_effects/lpe-mirror_symmetry.cpp
-src/live_effects/lpe-offset.cpp
-src/live_effects/lpe-parallel.cpp
-src/live_effects/lpe-path_length.cpp
 src/live_effects/lpe-patternalongpath.cpp
-src/live_effects/lpe-perp_bisector.cpp
-src/live_effects/lpe-perspective_path.cpp
 src/live_effects/lpe-powerstroke.cpp
-src/live_effects/lpe-recursiveskeleton.cpp
 src/live_effects/lpe-rough-hatches.cpp
 src/live_effects/lpe-ruler.cpp
-src/live_effects/lpe-skeleton.cpp
 src/live_effects/lpe-sketch.cpp
-src/live_effects/lpe-tangent_to_curve.cpp
-src/live_effects/lpe-test-doEffect-stack.cpp
-src/live_effects/lpe-text_label.cpp
 src/live_effects/lpe-vonkoch.cpp
 src/live_effects/parameter/bool.cpp
 src/live_effects/parameter/enum.h
@@ -180,14 +162,14 @@ src/menus-skeleton.h
 src/object-edit.cpp
 src/path-chemistry.cpp
 src/persp3d.cpp
-src/preferences.cpp
 src/preferences-skeleton.h
+src/preferences.cpp
 src/rdf.cpp
 src/resource-manager.cpp
 src/selection-chemistry.cpp
 src/selection-describer.cpp
-src/seltrans.cpp
 src/seltrans-handles.cpp
+src/seltrans.cpp
 src/shortcuts.cpp
 src/sp-anchor.cpp
 src/sp-ellipse.cpp
@@ -195,10 +177,9 @@ src/sp-flowregion.cpp
 src/sp-flowtext.cpp
 src/sp-guide.cpp
 src/sp-image.cpp
-src/sp-item.cpp
 src/sp-item-group.cpp
+src/sp-item.cpp
 src/sp-line.cpp
-src/splivarot.cpp
 src/sp-lpe-item.cpp
 src/sp-namedview.cpp
 src/sp-offset.cpp
@@ -213,6 +194,7 @@ src/sp-text.cpp
 src/sp-tref.cpp
 src/sp-tspan.cpp
 src/sp-use.cpp
+src/splivarot.cpp
 src/text-chemistry.cpp
 src/text-editing.cpp
 src/tools-switch.cpp
@@ -270,6 +252,7 @@ src/ui/tool/curve-drag-point.cpp
 src/ui/tool/multi-path-manipulator.cpp
 src/ui/tool/node.cpp
 src/ui/tool/path-manipulator.cpp
+src/ui/tool/transform-handle-set.cpp
 src/ui/tools/arc-tool.cpp
 src/ui/tools/box3d-tool.cpp
 src/ui/tools/calligraphic-tool.cpp
@@ -282,8 +265,8 @@ src/ui/tools/gradient-tool.cpp
 src/ui/tools/lpe-tool.cpp
 src/ui/tools/mesh-tool.cpp
 src/ui/tools/node-tool.cpp
-src/ui/tools/pencil-tool.cpp
 src/ui/tools/pen-tool.cpp
+src/ui/tools/pencil-tool.cpp
 src/ui/tools/rect-tool.cpp
 src/ui/tools/select-tool.cpp
 src/ui/tools/spiral-tool.cpp
@@ -292,7 +275,6 @@ src/ui/tools/star-tool.cpp
 src/ui/tools/text-tool.cpp
 src/ui/tools/tool-base.cpp
 src/ui/tools/tweak-tool.cpp
-src/ui/tool/transform-handle-set.cpp
 src/ui/widget/combo-enums.h
 src/ui/widget/entity-entry.cpp
 src/ui/widget/filter-effect-chooser.cpp
@@ -330,8 +312,8 @@ src/widgets/lpe-toolbar.cpp
 src/widgets/measure-toolbar.cpp
 src/widgets/mesh-toolbar.cpp
 src/widgets/node-toolbar.cpp
-src/widgets/paintbucket-toolbar.cpp
 src/widgets/paint-selector.cpp
+src/widgets/paintbucket-toolbar.cpp
 src/widgets/pencil-toolbar.cpp
 src/widgets/rect-toolbar.cpp
 src/widgets/ruler.cpp
@@ -342,10 +324,10 @@ src/widgets/sp-color-notebook.cpp
 src/widgets/sp-color-scales.cpp
 src/widgets/sp-color-selector.cpp
 src/widgets/sp-color-wheel-selector.cpp
-src/widgets/spiral-toolbar.cpp
-src/widgets/spray-toolbar.cpp
 src/widgets/sp-xmlview-attr-list.cpp
 src/widgets/sp-xmlview-content.cpp
+src/widgets/spiral-toolbar.cpp
+src/widgets/spray-toolbar.cpp
 src/widgets/star-toolbar.cpp
 src/widgets/stroke-marker-selector.cpp
 src/widgets/stroke-style.cpp
@@ -403,9 +385,9 @@ share/extensions/uniconv-ext.py
 share/extensions/uniconv_output.py
 share/extensions/voronoi2svg.py
 share/extensions/web-set-att.py
+share/extensions/web-transmit-att.py
 share/extensions/webslicer_create_group.py
 share/extensions/webslicer_export.py
-share/extensions/web-transmit-att.py
 share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/addnodes.inx
 [type: gettext/xml] share/extensions/ai_input.inx
@@ -415,13 +397,13 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/cdt_input.inx
 [type: gettext/xml] share/extensions/cgm_input.inx
 [type: gettext/xml] share/extensions/cmx_input.inx
+[type: gettext/xml] share/extensions/color_HSL_adjust.inx
 [type: gettext/xml] share/extensions/color_blackandwhite.inx
 [type: gettext/xml] share/extensions/color_brighter.inx
 [type: gettext/xml] share/extensions/color_custom.inx
 [type: gettext/xml] share/extensions/color_darker.inx
 [type: gettext/xml] share/extensions/color_desaturate.inx
 [type: gettext/xml] share/extensions/color_grayscale.inx
-[type: gettext/xml] share/extensions/color_HSL_adjust.inx
 [type: gettext/xml] share/extensions/color_lesshue.inx
 [type: gettext/xml] share/extensions/color_lesslight.inx
 [type: gettext/xml] share/extensions/color_lesssaturation.inx
@@ -490,8 +472,8 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/inkscape_help_relnotes.inx
 [type: gettext/xml] share/extensions/inkscape_help_reportabug.inx
 [type: gettext/xml] share/extensions/inkscape_help_svgspec.inx
-[type: gettext/xml] share/extensions/interp_att_g.inx
 [type: gettext/xml] share/extensions/interp.inx
+[type: gettext/xml] share/extensions/interp_att_g.inx
 [type: gettext/xml] share/extensions/jessyInk_autoTexts.inx
 [type: gettext/xml] share/extensions/jessyInk_effects.inx
 [type: gettext/xml] share/extensions/jessyInk_export.inx
@@ -525,13 +507,13 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/plt_output.inx
 [type: gettext/xml] share/extensions/polyhedron_3d.inx
 [type: gettext/xml] share/extensions/previous_glyph_layer.inx
-[type: gettext/xml] share/extensions/printing_marks.inx
 [type: gettext/xml] share/extensions/print_win32_vector.inx
+[type: gettext/xml] share/extensions/printing_marks.inx
 [type: gettext/xml] share/extensions/ps_input.inx
 [type: gettext/xml] share/extensions/radiusrand.inx
 [type: gettext/xml] share/extensions/render_alphabetsoup.inx
-[type: gettext/xml] share/extensions/render_barcode_datamatrix.inx
 [type: gettext/xml] share/extensions/render_barcode.inx
+[type: gettext/xml] share/extensions/render_barcode_datamatrix.inx
 [type: gettext/xml] share/extensions/render_barcode_qrcode.inx
 [type: gettext/xml] share/extensions/render_gear_rack.inx
 [type: gettext/xml] share/extensions/render_gears.inx
@@ -567,10 +549,10 @@ share/extensions/wireframe_sphere.py
 [type: gettext/xml] share/extensions/triangle.inx
 [type: gettext/xml] share/extensions/voronoi2svg.inx
 [type: gettext/xml] share/extensions/web-set-att.inx
+[type: gettext/xml] share/extensions/web-transmit-att.inx
 [type: gettext/xml] share/extensions/webslicer_create_group.inx
 [type: gettext/xml] share/extensions/webslicer_create_rect.inx
 [type: gettext/xml] share/extensions/webslicer_export.inx
-[type: gettext/xml] share/extensions/web-transmit-att.inx
 [type: gettext/xml] share/extensions/whirl.inx
 [type: gettext/xml] share/extensions/wireframe_sphere.inx
 [type: gettext/xml] share/extensions/wmf_input.inx