[SCM] 2D CAD system branch, 1.0-branch, updated. debian/1.0.1+nolibs-2-13-g7725789

Scott Howard showard at debian.org
Mon Apr 16 14:55:11 UTC 2012


The following commit has been merged in the 1.0-branch branch:
commit 772578975dff717694a261166be8c42ff4dcb9fb
Author: Scott Howard <showard at debian.org>
Date:   Mon Apr 16 10:50:01 2012 -0400

    refreshed patch, bumped to S-V 3.9.3

diff --git a/debian/changelog b/debian/changelog
index 493df5a..10abe51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ librecad (1.0.2+nolibs-1) unstable; urgency=low
   * Debian compat bumped to 9 for build hardening (Wheezy Release
     Goal)
   * Refreshed debian/patches/debian-fparser.patch
+  * Bumped S-V 3.9.3, no changes
 
- -- Scott Howard <showard at debian.org>  Mon, 16 Apr 2012 10:14:55 -0400
+ -- Scott Howard <showard at debian.org>  Mon, 16 Apr 2012 10:49:10 -0400
 
 librecad (1.0.1+nolibs-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e6f495a..71c3774 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ 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 (>= 9), libqt4-dev, qt4-dev-tools, libmuparser-dev,
- libdxflib-dev (>= 2.2.0.0-6), imagemagick, libmagickcore-extra
-Standards-Version: 3.9.2
+ libdxflib-dev (>= 2.2.0.0-6), imagemagick, librsvg2-bin
+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
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index 2bed505..df9d49b 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -6,21 +6,20 @@ Last-Update: 2011-08-05
 
 Index: librecad/librecad.pro
 ===================================================================
---- librecad.orig/librecad.pro	2012-04-16 10:09:14.000000000 -0400
-+++ librecad/librecad.pro	2012-04-16 10:13:08.048547917 -0400
-@@ -69,8 +69,9 @@
+--- librecad.orig/librecad.pro	2012-04-16 10:28:00.228569116 -0400
++++ librecad/librecad.pro	2012-04-16 10:28:32.416569886 -0400
+@@ -69,8 +69,8 @@
  
  
  # Additional libraries to load
 -# LIBS += \
 -# -Ldxflib/lib -ldxf \
 +LIBS += \
-+ -lfparser \
 + -ldxflib
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -84,7 +85,7 @@
+@@ -84,7 +84,7 @@
  LIBS += -lmuparser
  
  INCLUDEPATH += \
@@ -29,7 +28,7 @@ Index: librecad/librecad.pro
      src/cmd \
      src/lib/actions \
      src/lib/creation \
-@@ -109,16 +110,6 @@
+@@ -109,16 +109,6 @@
  # ################################################################################
  # Library
  HEADERS = \
@@ -46,7 +45,7 @@ Index: librecad/librecad.pro
      src/lib/actions/rs_actioninterface.h \
      src/lib/actions/rs_preview.h \
      src/lib/actions/rs_previewactioninterface.h \
-@@ -216,8 +207,6 @@
+@@ -216,8 +206,6 @@
      src/plugins/intern/qc_actiongetent.h
  
  SOURCES = \

-- 
2D CAD system



More information about the debian-science-commits mailing list