[SCM] 2D CAD system branch, master, updated. debian/2.0.0_alpha1+nolibs-1-11-g5351e4e
Scott Howard
showard at debian.org
Sun Mar 4 02:55:48 UTC 2012
The following commit has been merged in the master branch:
commit 5351e4e8514971aae4e0b8b4c43aa894b83886b3
Author: Scott Howard <showard at debian.org>
Date: Sat Mar 3 21:54:32 2012 -0500
building for release
diff --git a/debian/control b/debian/control
index 9617ecb..1df2575 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,13 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Scott Howard <showard at debian.org>, Ruben Molina <rmolina at udea.edu.co>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Build-Depends: debhelper (>= 8), libqt4-dev, qt4-dev-tools, libfparser-dev,
- libdxflib-dev (>= 2.2.0.0-6), imagemagick, libmagickcore-extra, libboost-dev, libfreetype6-dev
-Standards-Version: 3.9.2
+ libdxflib-dev (>= 2.2.0.0-8), imagemagick, libmagickcore-extra, libboost-dev, libfreetype6-dev
+Standards-Version: 3.9.3
Homepage: http://www.librecad.org/
DM-Upload-Allowed: yes
Vcs-Git: git://git.debian.org/git/debian-science/packages/librecad.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/librecad.git
-
Package: librecad
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, librecad-data (= ${source:Version})
diff --git a/debian/copyright b/debian/copyright
index 472adb5..e276fb9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=166
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: LibreCAD
Upstream-Contact: Ries van Twisk <ries at vantwisk.nl>
Source: http://www.librecad.org/
@@ -6,11 +6,10 @@ Source: http://www.librecad.org/
Files: *
Copyright: 2001-2003, RibbonSoft GmbH <www.qcad.com>
2010, Ries van Twisk <ries at vantwisk.nl>
-License: GPL-2+
+License: GPL-2
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; either version 2 of the License.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,10 +44,20 @@ License: LGPL-2
On Debian systems, the complete text of the GNU Library General Public License
version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
+Files: libraries/jwww/*
+Copyright: 2010 nemo zero <zeronemo2007 at gmail.com>
+License: GPL-2+
+
+Files: libraries/libdxfrw/*
+Copyright: 2011 Rallaz, rallazz at gmail.com
+License: GPL-2+
+
Files: debian/*
Copyright: 2009, Ruben Molina <rmolina at udea.edu.co>
2010, Scott Howard <showard314 at gmail.com>
License: GPL-2+
+
+License: GPL-2+
You can redistribute it and/or modify it under the terms of the GNU
General Public License as published by the Free Software Foundation;
either version 2 of the License, or (at your option) any later version.
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
deleted file mode 100644
index f6611ed..0000000
--- a/debian/patches/debian-fparser.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: use debian packaged fparser
-Author: Scott Howard <showard at debian.org>
-Author: Lisandro Damián Nicanor Pérez Meyer
-Last-Update: 2011-08-05
-
-
-Index: librecad/librecad.pro
-===================================================================
---- librecad.orig/librecad.pro 2012-02-12 12:30:21.637332723 -0500
-+++ librecad/librecad.pro 2012-02-12 12:31:31.949332384 -0500
-@@ -62,8 +62,9 @@
-
-
- # Additional libraries to load
--# LIBS += \
--# -Ldxflib/lib -ldxf \
-+LIBS += \
-+ -lfparser \
-+ -ldxflib
- # Store intermedia stuff somewhere else
- OBJECTS_DIR = intermediate/obj
- MOC_DIR = intermediate/moc
-@@ -75,8 +76,7 @@
- RESOURCES += res/extui/extui.qrc
-
- INCLUDEPATH += \
-- dxflib/src \
-- fparser \
-+ /usr/include/dxflib \
- src/cmd \
- src/lib/actions \
- src/lib/creation \
-@@ -101,17 +101,6 @@
- # ################################################################################
- # 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 \
-@@ -209,9 +198,6 @@
- src/plugins/intern/qc_actiongetent.h
-
- SOURCES = \
-- dxflib/src/dl_dxf.cpp \
-- dxflib/src/dl_writer_ascii.cpp \
-- fparser/fparser.cc \
- src/lib/actions/rs_actioninterface.cpp \
- src/lib/actions/rs_preview.cpp \
- src/lib/actions/rs_previewactioninterface.cpp \
diff --git a/debian/patches/debian_build.patch b/debian/patches/debian_build.patch
new file mode 100644
index 0000000..b687145
--- /dev/null
+++ b/debian/patches/debian_build.patch
@@ -0,0 +1,82 @@
+Description: Upstream changes introduced in version 2.0.0~alpha2+nolibs-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ librecad (2.0.0~alpha2+nolibs-1) experimental; urgency=low
+ .
+ * New upstream release, experimental developmental
+ * Removed dependency on libqt4-sql-sqlite since help is no longer
+ included
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Scott Howard <showard at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- librecad-2.0.0~alpha2+nolibs.orig/libraries/libraries.pro
++++ librecad-2.0.0~alpha2+nolibs/libraries/libraries.pro
+@@ -10,8 +10,6 @@ TARGET = libraries
+
+ SUBDIRS = \
+ libdxfrw \
+- dxflib \
+- jwwlib \
+- fparser
++ jwwlib
+
+
+--- librecad-2.0.0~alpha2+nolibs.orig/librecad/src/src.pro
++++ librecad-2.0.0~alpha2+nolibs/librecad/src/src.pro
+@@ -33,9 +33,7 @@ CONFIG += qt \
+ help verbose
+
+ PRE_TARGETDEPS += ../../generated/lib/libdxfrw.a
+-PRE_TARGETDEPS += ../../generated/lib/libdxflib.a
+ PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a
+-PRE_TARGETDEPS += ../../generated/lib/libfparser.a
+
+ DESTDIR = $${INSTALLDIR}
+
+@@ -69,17 +67,16 @@ win32 {
+ }
+
+ # Additional libraries to load
+-LIBS += -L../../generated/lib \
++LIBS += -L../../generated/lib \
+ -ldxflib \
+ -ldxfrw \
+ -ljwwlib \
+ -lfparser
+
+ DEPENDPATH += \
+- ../../libraries/dxflib/src \
++ /usr/include/dxflib \
+ ../../libraries/libdxfrw/src \
+ ../../libraries/jwwlib/src \
+- ../../libraries/fparser \
+ cmd \
+ lib/actions \
+ lib/creation \
+--- librecad-2.0.0~alpha2+nolibs.orig/libraries/jwwlib/jwwlib.pro
++++ librecad-2.0.0~alpha2+nolibs/libraries/jwwlib/jwwlib.pro
+@@ -22,7 +22,7 @@ include(../../settings.pro)
+ include(../../common.pro)
+
+ INCLUDEPATH += \
+- ../dxflib/src
++ /usr/include/dxflib
+
+ SOURCES += \
+ src/dl_jww.cpp \
diff --git a/debian/patches/series b/debian/patches/series
index 347459f..b4feaaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-fparser.patch
+debian_build.patch
diff --git a/debian/rules b/debian/rules
index 1f7d535..223f590 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,17 +15,12 @@ override_dh_clean:
rm -rf debian/librecad.1 debian/librecad.desktop debian/librecad.sharedmimeinfo debian/librecad.mime debian/librecad.png debian/librecad.xpm debian/librecad.svg support/doc/LibreCADdoc.qch support/doc/LibreCADdoc.qhc plugins/intermediate
override_dh_auto_configure:
- dh_auto_configure
- qmake plugins/plugins.pro
+ qmake librecad.pro
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
-override_dh_auto_build:
- dh_auto_build
- cd plugins && make #until later releases when plugins are built by default
-
override_dh_compress:
dh_compress -X.qch -X.qhc
--
2D CAD system
More information about the debian-science-commits
mailing list