[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5+nolibs-1-23-g4346d0c
Scott Howard
showard314 at gmail.com
Sat Jun 18 16:51:49 UTC 2011
The following commit has been merged in the master branch:
commit 4346d0c5d0152b9a7ba7e01dc2cada86bdd0862f
Author: Scott Howard <showard314 at gmail.com>
Date: Sat Jun 18 12:21:52 2011 -0400
Use upstreams new icons, .desktop, manpage, and mime info
diff --git a/debian/changelog b/debian/changelog
index bffc1a1..0ffcfaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+librecad (1.0.0~rc1+nolibs-2) unstable; urgency=low
+
+ * Use upstreams new icons, .desktop, manpage, and mime info
+ * resize_icon_canvas.patch added to use upstream icon in debian
+
+ -- Scott Howard <showard at debian.org> Sat, 18 Jun 2011 12:21:18 -0400
+
librecad (1.0.0~rc1+nolibs-1) unstable; urgency=low
[Lisandro Damián Nicanor Pérez Meyer]
diff --git a/debian/control b/debian/control
index 462968d..aaf4c74 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Scott Howard <showard at debian.org>, Ruben Molina <rmolina at udea.edu.co>,
Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
-Build-Depends: debhelper (>= 8), libqt4-dev, libfparser-dev, libdxflib-dev
+Build-Depends: debhelper (>= 8), libqt4-dev, libfparser-dev, libdxflib-dev, imagemagick,
+ librsvg2-bin
Standards-Version: 3.9.2
Homepage: http://www.librecad.org/
DM-Upload-Allowed: yes
diff --git a/debian/librecad.1 b/debian/librecad.1
deleted file mode 100644
index f8abb95..0000000
--- a/debian/librecad.1
+++ /dev/null
@@ -1,11 +0,0 @@
-.TH LIBRECAD 1 "January 2010" "Debian GNU/Linux"
-.SH NAME
-LIBRECAD \- A professional CAD System.
-.SH DESCRIPTION
-LibreCAD is a professional CAD System. With LibreCAD you can easily construct and
-change drawings with ISO-texts and many other features and save them as
-DXF-files. These DXF-files are the interface to many CAD-systems such as
-AutoCAD(R) and many others.
-
-LibreCAD has no special invocation parameters. You can find the useful
-docs in /usr/share/doc/librecad
diff --git a/debian/librecad.desktop b/debian/librecad.desktop
deleted file mode 100644
index 5222a16..0000000
--- a/debian/librecad.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LibreCAD
-Comment=A professional CAD System
-Comment[es]=Un sistema CAD profesional
-TryExec=librecad
-Exec=librecad %F
-Icon=librecad
-Categories=Graphics;Engineering;
-MimeType=image/vnd.dxf
diff --git a/debian/librecad.install b/debian/librecad.install
index 18b83d2..340a57f 100644
--- a/debian/librecad.install
+++ b/debian/librecad.install
@@ -1,3 +1,5 @@
unix/librecad /usr/bin
debian/librecad.xpm /usr/share/pixmaps
+debian/librecad.png /usr/share/icons/hicolor/48x48/apps/
+debian/librecad.svg /usr/share/icons/hicolor/scalable/apps/
debian/librecad.desktop /usr/share/applications
diff --git a/debian/librecad.mime b/debian/librecad.mime
deleted file mode 100644
index 32a3e19..0000000
--- a/debian/librecad.mime
+++ /dev/null
@@ -1 +0,0 @@
-image/vnd.dxf; libreCAD '%f'; test=test -n "$DISPLAY"; description="Drawing Exchange Format"; nametemplate=%s.dxf
diff --git a/debian/librecad.sharedmimeinfo b/debian/librecad.sharedmimeinfo
deleted file mode 100644
index 1fe2b09..0000000
--- a/debian/librecad.sharedmimeinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
- <mime-type type="image/vnd.dxf">
- <glob pattern="*.dxf"/>
- </mime-type>
-</mime-info>
-
diff --git a/debian/librecad.xpm b/debian/librecad.xpm
deleted file mode 100644
index 8c7c29e..0000000
--- a/debian/librecad.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * librecad_xpm[] = {
-"32 32 2 1",
-" c None",
-". c #F12424",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" . ",
-" . ",
-" . .... . ...... ",
-" . . . . . . .. ",
-" . . . . . .. ",
-" . . . . . . ",
-" . . . . . . ",
-" . . ....... . . ",
-" . . . . . .. ",
-" . . . . . . .. ",
-" . .... . . ...... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/debian/patches/resizing_icon_canvas.patch b/debian/patches/resizing_icon_canvas.patch
new file mode 100644
index 0000000..8bc765a
--- /dev/null
+++ b/debian/patches/resizing_icon_canvas.patch
@@ -0,0 +1,74 @@
+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 347459f..6705882 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debian-fparser.patch
+resizing_icon_canvas.patch
diff --git a/debian/rules b/debian/rules
index f7673e1..2d3de33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,15 @@ override_dh_clean:
dh_clean
rm -rf unix/
find . -name *.qm -delete
+ rm -f debian/librecad.1 debian/librecad.desktop debian/librecad.sharedmimeinfo debian/librecad.mime debian/librecad.png debian/librecad.xpm debian/librecad.svg
+
+override_dh_auto_configure:
+ dh_auto_configure
+ cp desktop/librecad* debian
+ cp desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg debian/librecad.svg
+ convert -resize 48x48 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg debian/librecad.png
+ convert -resize 32x32 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg debian/librecad.xpm
-REVISION=106
VERSION=1.0.0~rc1
get-orig-source:
diff --git a/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg b/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg
index 8dee71f..61df798 100644
--- a/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg
+++ b/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/librecad.pro b/librecad.pro
index dcf737f..a22c8e2 100755
--- a/librecad.pro
+++ b/librecad.pro
@@ -62,8 +62,9 @@ win32 {
# Additional libraries to load
-# LIBS += \
-# -Ldxflib/lib -ldxf \
+LIBS += \
+ -lfparser \
+ -ldxflib
# Store intermedia stuff somewhere else
OBJECTS_DIR = intermediate/obj
MOC_DIR = intermediate/moc
@@ -74,8 +75,7 @@ UI_HEADERS_DIR = intermediate/ui
UI_SOURCES_DIR = intermediate/ui
RESOURCES += res/extui/extui.qrc
-INCLUDEPATH += dxflib/src \
- fparser \
+INCLUDEPATH += \
src/cmd \
src/lib/actions \
src/lib/creation \
@@ -98,17 +98,6 @@ INCLUDEPATH += dxflib/src \
# ################################################################################
# Library
HEADERS = \
- dxflib/src/dl_attributes.h \
- dxflib/src/dl_codes.h \
- dxflib/src/dl_creationadapter.h \
- dxflib/src/dl_creationinterface.h \
- dxflib/src/dl_dxf.h \
- dxflib/src/dl_entities.h \
- dxflib/src/dl_exception.h \
- dxflib/src/dl_extrusion.h \
- dxflib/src/dl_writer.h \
- dxflib/src/dl_writer_ascii.h \
- fparser/fparser.hh \
src/lib/actions/rs_actioninterface.h \
src/lib/actions/rs_preview.h \
src/lib/actions/rs_previewactioninterface.h \
@@ -216,9 +205,7 @@ HEADERS = \
src/plugins/document_interface.h \
src/plugins/qc_plugininterface.h
-SOURCES = dxflib/src/dl_dxf.cpp \
- dxflib/src/dl_writer_ascii.cpp \
- fparser/fparser.cc \
+SOURCES = \
src/lib/actions/rs_actioninterface.cpp \
src/lib/actions/rs_preview.cpp \
src/lib/actions/rs_previewactioninterface.cpp \
--
2D CAD system
More information about the debian-science-commits
mailing list