Viewing all changes in revision 6.
- Committer: Bazaar Package Importer
- Date: 2010-04-12 00:18:23 UTC
- mfrom: (3.1.3 sid)
- Revision ID: james.westby@ubuntu.com-20100412001823-q8bfh19k56ryrmx2
* Merge from debian testing. (LP: #515016) Remaining changes:
  - debian/control: Don't hardcode python dependencies.
* debian/control: Add versioned dependency on python-protobuf
  (>= 2.2.0a-0.1) (LP: #515016, Closes: #570685)
  - debian/control: Don't hardcode python dependencies.
* debian/control: Add versioned dependency on python-protobuf
  (>= 2.2.0a-0.1) (LP: #515016, Closes: #570685)
- files added:
- backgrounds/50_comicthumbs.png
- debian/source
- desktop/icons
- desktop/icons/hicolor
- desktop/icons/hicolor/16x16
- desktop/icons/hicolor/16x16/apps
- desktop/icons/hicolor/22x22
- desktop/icons/hicolor/22x22/apps
- desktop/icons/hicolor/24x24
- desktop/icons/hicolor/24x24/apps
- desktop/icons/hicolor/32x32
- desktop/icons/hicolor/32x32/apps
- desktop/icons/hicolor/48x48
- desktop/icons/hicolor/48x48/apps
- desktop/icons/hicolor/scalable
- desktop/icons/hicolor/scalable/apps
- pixmaps
- po
- tests
- files removed:
- brushes/ab002.myb
- desktop/16x16
- desktop/22x22
- desktop/24x24
- desktop/32x32
- desktop/48x48
- desktop/scalable
- files modified:
- .gitignore
expand all
collapse all
added
removed
backgrounds/50_comicthumbs.png
backgrounds/50_storyboard-template.png
backgrounds/default.png
brushes/100%_Opaque_prev.png
brushes/4B_pencil_prev.png
brushes/Airbrush_prev.png
brushes/Blur_ramon_prev.png
brushes/Brush_blur_prev.png
brushes/Charcoal_ramon_prev.png
brushes/Classic_Paint_prev.png
brushes/Clouds_prev.png
brushes/Delayed_Line_prev.png
brushes/Dust_prev.png
brushes/Glazing_prev.png
brushes/Glow_ramon_prev.png
brushes/Grain_prev.png
brushes/Grass_1_prev.png
brushes/Grass_2_prev.png
brushes/Grass_3_prev.png
brushes/Grass_P_prev.png
brushes/Hair__prev.png
brushes/HardSoft_prev.png
brushes/Hard_Eraser_prev.png
brushes/Ico_Alias_Brush_prev.png
brushes/Ico_Basic_Round_prev.png
brushes/Ico_Bubble_Blender_prev.png
brushes/Ico_Bubble_Brush_prev.png
brushes/Ico_Calligraphic_Pen_noborder_prev.png
brushes/Ico_Calligraphic_Pen_prev.png
brushes/Ico_Chaotic_Smudge_prev.png
brushes/Ico_Color_Smudge_+_prev.png
brushes/Ico_Crazy_Line_prev.png
brushes/Ico_Cutting_Flat_prev.png
brushes/Ico_Dry_Pen_prev.png
brushes/Ico_Felt_pen_prev.png
brushes/Ico_Flake_Blender_02_prev.png
brushes/Ico_Flake_Blender_prev.png
brushes/Ico_Flake_Dropping_prev.png
brushes/Ico_Flat_Basic_prev.png
brushes/Ico_Flat_Blender_prev.png
brushes/Ico_Flat_Mix_prev.png
brushes/Ico_Flat_Pen_prev.png
brushes/Ico_Glitter_Smudge_B_prev.png
brushes/Ico_Hard_Eraser_prev.png
brushes/Ico_Hard_Oil_prev.png
brushes/Ico_Impressionism_01_prev.png
brushes/Ico_Impressionism_02_prev.png
brushes/Ico_Irregular_Tube_prev.png
brushes/Ico_Jittering_Water_prev.png
brushes/Ico_Line_Dropping_prev.png
brushes/Ico_Line_Sketcher_prev.png
brushes/Ico_Linear_Watercolor_prev.png
brushes/Ico_Liquid_Pen_+_prev.png
brushes/Ico_Micro_Felt_Pen_prev.png
brushes/Ico_Mod_Deevad_Basic_prev.png
brushes/Ico_NewBasic_+_MultiC_prev.png
brushes/Ico_New_Basic_B_prev.png
brushes/Ico_New_Basic_prev.png
brushes/Ico_OC_Brush_prev.png
brushes/Ico_OC_Hard_Pen_prev.png
brushes/Ico_OC_Pen_prev.png
brushes/Ico_Oil_Blender_B_prev.png
brushes/Ico_Oil_Blender_C_prev.png
brushes/Ico_Oil_Blender_prev.png
brushes/Ico_Pastel_Stain_prev.png
brushes/Ico_Precise_Pen_02_prev.png
brushes/Ico_Precise_Pen_prev.png
brushes/Ico_Rigid_Pen_prev.png
brushes/Ico_Smudge_Glitter_prev.png
brushes/Ico_Soft_Eraser_prev.png
brushes/Ico_Soft_Oil_prev.png
brushes/Ico_Variable_Flat_Pen_prev.png
brushes/Ico_Water_Line_prev.png
brushes/Ico_Water_Mix_prev.png
brushes/Ico_Water_Splash_prev.png
brushes/Ico_Water_Stain_B_prev.png
brushes/Ico_Water_Stain_prev.png
brushes/Ico_Watercolor_01_prev.png
brushes/Ico_Watercolor_Smudge_prev.png
brushes/Ico_Watery_Pen_02_prev.png
brushes/Ico_Watery_Pen_prev.png
brushes/Ico_Weak_Flat_prev.png
brushes/Ico_Weak_Painting_prev.png
brushes/Ico_Wet_Flat_prev.png
brushes/Jitter_prev.png
brushes/Knife_prev.png
brushes/Marker_prev.png
brushes/Offset_Splats_prev.png
brushes/P.Shade2_prev.png
brushes/P._Shade_prev.png
brushes/PenBrush_prev.png
brushes/RS_blendOP_prev.png
brushes/Round_Bl_prev.png
brushes/Round_prev.png
brushes/Sketch_1_prev.png
brushes/Sketch_2_prev.png
brushes/Smear_prev.png
brushes/Smudge_ramon_prev.png
brushes/Soft_Eraser_prev.png
brushes/Sparks_prev.png
brushes/Splats_1_prev.png
brushes/Splats_2_prev.png
brushes/Splats_3_prev.png
brushes/Splats_4_prev.png
brushes/Splats_5_prev.png
brushes/Splatter-drop2_prev.png
brushes/Splatter-drop_prev.png
brushes/Starfield_prev.png
brushes/Wet_Direction_prev.png
brushes/Wet_Soft_prev.png
brushes/Wet_Solid_prev.png
brushes/ab002_prev.png
brushes/ab007_prev.png
brushes/ab023_prev.png
brushes/ab026_prev.png
brushes/ab033_prev.png
brushes/acrylic-01-only-water_prev.png
brushes/acrylic-01-paint_prev.png
brushes/acrylic-01-with-water_prev.png
brushes/acrylic-02-only-water_prev.png
brushes/acrylic-02-paint_prev.png
brushes/acrylic-02-with-water_prev.png
brushes/acrylic-03-only-water_prev.png
brushes/acrylic-03-paint_prev.png
brushes/acrylic-03-with-water_prev.png
brushes/acrylic-04-only-water_prev.png
brushes/acrylic-04-paint_prev.png
brushes/acrylic-04-with-water_prev.png
brushes/acrylic-05-only-water_prev.png
brushes/acrylic-05-paint_prev.png
brushes/acrylic-05-with-water_prev.png
brushes/airbrush-digital_prev.png
brushes/airbrush-real-dirty_prev.png
brushes/airbrush-real_prev.png
brushes/ballpoint-pen_prev.png
brushes/basic-flat_prev.png
brushes/basic-round_prev.png
brushes/bi004_prev.png
brushes/bigcharcoal_prev.png
brushes/charcoal-01_prev.png
brushes/charcoal-02_prev.png
brushes/charcoal-03_prev.png
brushes/charcoal-04_prev.png
brushes/charcoal-blur1_prev.png
brushes/charcoal-blur2_prev.png
brushes/decoration-01_prev.png
brushes/decoration-02_prev.png
brushes/decoration-03_prev.png
brushes/decoration-04_prev.png
brushes/decoration-05_prev.png
brushes/decoration-06_prev.png
brushes/decoration-07_prev.png
brushes/decoration-08_prev.png
brushes/decoration-09_prev.png
brushes/detail-soft_prev.png
brushes/details-hard_prev.png
brushes/fur_prev.png
brushes/ink-fill_prev.png
brushes/ink-pen_prev.png
brushes/ink_hard_prev.png
brushes/o558_prev.png
brushes/o888_prev.png
brushes/oil-01-clean_prev.png
brushes/oil-01-paint_prev.png
brushes/oil-02-clean_prev.png
brushes/oil-02-paint_prev.png
brushes/oil-03-clean_prev.png
brushes/oil-03-paint_prev.png
brushes/oil-04-clean_prev.png
brushes/oil-04-paint_prev.png
brushes/oil-05-clean_prev.png
brushes/oil-05-paint_prev.png
brushes/oil-06-clean_prev.png
brushes/oil-06-paint_prev.png
brushes/oil-mop_prev.png
brushes/old_b008_prev.png
brushes/pencil-2b-deevad_prev.png
brushes/pencil-color_prev.png
brushes/pencil-mechanical_prev.png
brushes/s002_prev.png
brushes/s009_prev.png
brushes/slow_prev.png
brushes/smudge-blur_prev.png
brushes/smudge-classic_prev.png
brushes/snow_1_prev.png
brushes/snow_2_prev.png
brushes/soft-large_prev.png
brushes/texture-01_prev.png
brushes/texture-02_prev.png
brushes/texture-03_prev.png
brushes/texture-04_prev.png
brushes/texture-05_prev.png
brushes/texture-06_prev.png
brushes/texture-07_prev.png
brushes/texture-08_prev.png
brushes/texture-09_prev.png
brushes/texture-10_prev.png
brushes/texture-11_prev.png
brushes/texture-12_prev.png
brushes/texture-tree_prev.png
brushes/textured-angle_prev.png
brushes/textured-charcoal_prev.png
brushes/textured-grain_prev.png
brushes/tree_2_prev.png
brushes/tree_prev.png
brushes/water-01_prev.png
brushes/water-02_prev.png
brushes/water-03_prev.png
brushes/water-04_prev.png
brushes/water-05_prev.png
brushes/water-06_prev.png
brushes/watercolor-01-paint_prev.png
brushes/watercolor-01-water_prev.png
brushes/watercolor-02-paint_prev.png
brushes/watercolor-02-water_prev.png
brushes/wet-flat_prev.png
brushes/wet-round_prev.png
brushes/wet_airbrush_prev.png
brushes/wet_round_prev.png
desktop/16x16/mypaint.png
desktop/22x22/mypaint.png
desktop/24x24/mypaint.png
desktop/32x32/mypaint.png
desktop/48x48/mypaint.png
desktop/icons/hicolor/16x16/apps/mypaint.png
desktop/icons/hicolor/22x22/apps/mypaint.png
desktop/icons/hicolor/24x24/apps/mypaint.png
desktop/icons/hicolor/32x32/apps/mypaint.png
desktop/icons/hicolor/48x48/apps/mypaint.png
desktop/icons/hicolor/scalable/apps/mypaint.svg
desktop/mypaint_48.png
desktop/scalable/mypaint.svg
pixmaps/cursor_color_picker.png
pixmaps/mypaint_logo.png
pixmaps/plus.png
tests/correct_docPaint_alpha.png
tests/correct_docPaint_flat.png
