[freecad] 02/02: Simplify debian/rules.

Anton Gladky gladk at alioth.debian.org
Wed Sep 18 19:04:54 UTC 2013


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository freecad.

commit b4801bc52a7d319d186ffe4a7ea2edf407723e2e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Sep 18 21:04:41 2013 +0200

    Simplify debian/rules.
---
 debian/freecad.install |    4 ++--
 debian/rules           |   16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/freecad.install b/debian/freecad.install
index e99ede2..afe48bd 100644
--- a/debian/freecad.install
+++ b/debian/freecad.install
@@ -1,6 +1,6 @@
 usr/bin/ usr/lib/freecad/
 usr/lib/ usr/lib/freecad/
-usr/Mod/ usr/lib/freecad/
+usr/Mod  usr/lib/freecad/
+usr/data/Mod  usr/share/freecad/
 debian/freecad.desktop usr/share/applications
 debian/menu usr/share/menu/freecad
-usr/share
diff --git a/debian/rules b/debian/rules
index 7ae6170..f97c650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,35 +2,19 @@
 %:
 	dh $@ --buildsystem=cmake --parallel
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 extra_flags += \
 -DFREECAD_BUILD_DEBIAN=ON \
 -DCMAKE_CXX_FLAGS="-Wall -DHAVE_SWIG=1 -fpermissive $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
 -DCMAKE_C_FLAGS="-Wall -fpermissive $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
 -DCMAKE_SHARED_LINKER_FLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \
 -DINSTALL_RPATH="/usr/lib/freecad/lib" \
--DCMAKE_INSTALL_PREFIX="/usr" \
--DCMAKE_INSTALL_DATADIR="share/freecad" \
--DRESOURCEDIR="/usr/share/freecad" \
--DCMAKE_INSTALL_INCLUDEDIR="include/freecad" \
 -DOCC_INCLUDE_DIR="/usr/include/oce" \
-#-DCMAKE_INSTALL_DOCDIR="share/doc/freecad" \
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
-	cp -f src/Build/Version.h obj-$(DEB_BUILD_GNU_TYPE)/src/Build/Version.h
 
 override_dh_compress:
 	dh_compress -X.qch -X.qhc
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.txt
-
-override_dh_auto_clean:
-	find -name '*.pyc' | xargs rm -f
-	rm -rf obj-* src/Mod/Start/Gui/share src/Mod/Drawing/App/share
-	dh_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git



More information about the debian-science-commits mailing list