[SCM] FreeCAD packaging branch, master, updated. debian/0.11.3729.dfsg-1-4-g3bf02f8

[Anton Gladky]

The following commit has been merged in the master branch:
commit 3bf02f8c01eb0b1c7121091a368ec62005ef5174
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Apr 14 21:05:23 2011 +0100

    Fix some lintian warnings

diff --git a/debian/changelog b/debian/changelog
index e1ae9f5..55cb0bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ freecad (0.11.3729.dfsg-2) unstable; urgency=low
 
   * Add gfortran and libopencascade-visualization-dev to BD
     to fix FTBFS (closes: #622694)
-  * Add libqtwebkit-dev to BD to fix 618241 
+  * Add libqtwebkit-dev to BD to fix 618241.
+  * Delete quilt from BD and corresponding changes in rules.
+  * Add description to freecad-occ650.patch
+  * Delete encoding string from .desktop
 
- -- Anton Gladky <gladky.anton at gmail.com>  Thu, 14 Apr 2011 09:45:45 +0100
+ -- Anton Gladky <gladky.anton at gmail.com>  Thu, 14 Apr 2011 10:23:25 +0100
 
 freecad (0.11.3729.dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7a31430..0762939 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders: Teemu Ikonen <tpikonen at gmail.com>, "Adam C. Powell, IV" <hazelsct at deb
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
 Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-Build-Depends: debhelper (>= 7.0.50~), quilt,
- autotools-dev, libtool, automake, autoconf,
- libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool, automake, 
+ autoconf, libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
  libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
  libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
  libboost-python-dev, python-dev, python-support,
@@ -22,11 +21,10 @@ Standards-Version: 3.9.2
 
 Package: freecad
 Architecture: any
-Section: science
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Recommends: python-pivy
 Suggests: freecad-doc
-Description: An extensible Open Source CAx program (alpha)
+Description: Extensible Open Source CAx program (alpha)
  FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
  It features some key concepts like macro recording, workbenches, ability
  to run as a server and dynamically loadable application extensions and
@@ -47,7 +45,7 @@ Description: FreeCAD development files
  it is designed to be platform independent.
  For more details see http://sourceforge.net/projects/free-cad
  .
- This package contains the libtool .la files, headers and symlinks necessary to
+ This package contains headers and symlinks necessary to
  develop modules for FreeCAD.
 
 Package: freecad-doc
diff --git a/debian/freecad.desktop b/debian/freecad.desktop
index b02dbf3..7e0b9e5 100644
--- a/debian/freecad.desktop
+++ b/debian/freecad.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=FreeCAD
 Name[de]=FreeCAD
 Comment=Feature based Parametric Modeler
diff --git a/debian/patches/freecad-occ650.patch b/debian/patches/freecad-occ650.patch
index 8451c15..6514a1d 100644
--- a/debian/patches/freecad-occ650.patch
+++ b/debian/patches/freecad-occ650.patch
@@ -1,3 +1,6 @@
+Description: OpenCASCADE 6.5.0 compatibility patch
+Author: Denis Barbier
+
 Index: freecad/src/Mod/Part/App/PrimitiveFeature.cpp
 ===================================================================
 --- freecad.orig/src/Mod/Part/App/PrimitiveFeature.cpp
diff --git a/debian/rules b/debian/rules
index 92b5d98..585e1f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,6 @@ else
 endif
 
 patch-stamp:
-	if [ ! -d .pc ]; then \
-	  QUILT_PATCHES=debian/patches quilt push -a; \
-	fi
 	touch $@
 
 configure: autogen.sh patch-stamp
@@ -70,9 +67,7 @@ clean:
 	    m4/ltversion.m4 m4/lt~obsolete.m4; do \
 	  mv -f $$autotools_mod_file.setaside $$autotools_mod_file; \
 	done; fi
-	if [ -d .pc ]; then \
-	  QUILT_PATCHES=debian/patches quilt pop -a && rm -rf .pc; \
-	fi
+	dh clean
 	rm -f patch-stamp
 
 install: build install-stamp

-- 
FreeCAD packaging