[SCM] 2D CAD system branch, master, updated. debian/1.0.0-rc1+nolibs-4-8-g40b9f44

Lisandro Damián Nicanor Pérez Meyer perezmeyer at gmail.com
Tue Sep 6 02:11:27 UTC 2011


The following commit has been merged in the master branch:
commit 40b9f44b9139fc63e677ab109dbb93621d0836db
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 5 23:03:32 2011 -0300

    Remove resizing_icon_canvas.patch.
    
    It has been applied upstream.

diff --git a/debian/changelog b/debian/changelog
index d6a131d..66ef7dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ librecad (1.0.0~rc2+nolibs-1) unstable; urgency=low
   * New upstream release.
     - Fixes rounded values (Closes: #640390).
   * Refresh debian-fparser.patch.
+  * Remove resizing_icon_canvas.patch, it has been applied upstream.
 
  -- Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>  Mon, 05 Sep 2011 22:42:41 -0300
 
diff --git a/debian/patches/resizing_icon_canvas.patch b/debian/patches/resizing_icon_canvas.patch
deleted file mode 100644
index 8bc765a..0000000
--- a/debian/patches/resizing_icon_canvas.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: removed blank canvas from svg
-Author: Scott Howard <showard at debian.org>
-Bug: Scott will commit to upstream's master branch
-
---- librecad-1.0.0~rc1+nolibs.orig/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg	
-+++ librecad-1.0.0~rc1+nolibs/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg	
-@@ -9,11 +9,11 @@
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
--   width="744.09448819"
--   height="1052.3622047"
-+   width="99.999725"
-+   height="100.00037"
-    id="svg2"
-    version="1.1"
--   inkscape:version="0.48.0 r9654"
-+   inkscape:version="0.48.1 r9760"
-    sodipodi:docname="Icon_Librecad.svg">
-   <title
-      id="title3808">LibreCAD Icon</title>
-@@ -37,16 +37,20 @@
-      inkscape:pageopacity="0.0"
-      inkscape:pageshadow="2"
-      inkscape:zoom="6.1060241"
--     inkscape:cx="282.85714"
--     inkscape:cy="564.28571"
-+     inkscape:cx="53.295482"
-+     inkscape:cy="49.04802"
-      inkscape:document-units="px"
-      inkscape:current-layer="layer1"
-      showgrid="false"
--     inkscape:window-width="1680"
--     inkscape:window-height="942"
-+     inkscape:window-width="1440"
-+     inkscape:window-height="876"
-      inkscape:window-x="0"
--     inkscape:window-y="0"
--     inkscape:window-maximized="0" />
-+     inkscape:window-y="24"
-+     inkscape:window-maximized="1"
-+     fit-margin-top="0"
-+     fit-margin-left="0"
-+     fit-margin-right="0"
-+     fit-margin-bottom="0" />
-   <metadata
-      id="metadata7">
-     <rdf:RDF>
-@@ -95,7 +99,8 @@
-   <g
-      inkscape:label="Layer 1"
-      inkscape:groupmode="layer"
--     id="layer1">
-+     id="layer1"
-+     transform="translate(-226.69563,-436.90297)">
-     <rect
-        height="100.00001"
-        width="99.999428"
-@@ -111,13 +116,13 @@
-        inkscape:connector-curvature="0" />
-     <g
-        id="g3010"
--       transform="translate(-95.351883,-39.277969)">
-+       transform="translate(-95.35188,-39.277969)">
-       <polygon
-          transform="matrix(5.7120336,0,0,5.7120336,322.04724,476.18085)"
-          style="fill:#4d4d4d"
-          id="_471970800"
-          class="fil2"
--         points="4.20177,7.70289 17.5069,7.70289 17.5069,9.80372 4.20177,9.80372 4.20177,10.8542 0.000103387,10.8542 0.000103387,6.65257 4.20177,6.65257 " />
-+         points="0.000103387,6.65257 4.20177,6.65257 4.20177,7.70289 17.5069,7.70289 17.5069,9.80372 4.20177,9.80372 4.20177,10.8542 0.000103387,10.8542 " />
-       <g
-          id="g3004">
-         <rect
diff --git a/debian/patches/series b/debian/patches/series
index 6705882..347459f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debian-fparser.patch
-resizing_icon_canvas.patch

-- 
2D CAD system



More information about the debian-science-commits mailing list