Revision: 42728
http://brlcad.svn.sourceforge.net/brlcad/?rev=42728&view=rev
Author: jordisayol
Date: 2011-01-28 21:03:00 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
Upgraded the debian package build proccess. Added mged, archer, rtwizard,
documentation and examples menus. Added brlcad mime type. Added brlcad mime
file association.
Modified Paths:
--------------
brlcad/trunk/misc/debian/changelog
brlcad/trunk/misc/debian/control
brlcad/trunk/misc/debian/copyright
brlcad/trunk/misc/debian/rules
brlcad/trunk/sh/make_deb.sh
Added Paths:
-----------
brlcad/trunk/misc/debian/application-x-brlcad-extension.png
brlcad/trunk/misc/debian/application-x-brlcad-extension.xml
brlcad/trunk/misc/debian/brlcad-archer.desktop
brlcad/trunk/misc/debian/brlcad-archer.png
brlcad/trunk/misc/debian/brlcad-db.desktop
brlcad/trunk/misc/debian/brlcad-db.png
brlcad/trunk/misc/debian/brlcad-doc.desktop
brlcad/trunk/misc/debian/brlcad-doc.directory
brlcad/trunk/misc/debian/brlcad-doc.png
brlcad/trunk/misc/debian/brlcad-mged.desktop
brlcad/trunk/misc/debian/brlcad-rtwizard.desktop
brlcad/trunk/misc/debian/brlcad.directory
brlcad/trunk/misc/debian/brlcad.docs
brlcad/trunk/misc/debian/brlcad.install
brlcad/trunk/misc/debian/brlcad.menu
brlcad/trunk/misc/debian/brlcad.png
brlcad/trunk/misc/debian/brlcad.postinst
brlcad/trunk/misc/debian/brlcad.postrm
brlcad/trunk/misc/debian/brlcad.sh
Removed Paths:
-------------
brlcad/trunk/misc/debian/brlcad-bin.docs
brlcad/trunk/misc/debian/brlcad-bin.install
brlcad/trunk/misc/debian/brlcad-bin.lintian-overrides
brlcad/trunk/misc/debian/brlcad-data.install
brlcad/trunk/misc/debian/brlcad-dev.install
brlcad/trunk/misc/debian/brlcad-doc.install
brlcad/trunk/misc/debian/watch
Added: brlcad/trunk/misc/debian/application-x-brlcad-extension.png
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/application-x-brlcad-extension.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: brlcad/trunk/misc/debian/application-x-brlcad-extension.xml
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/application-x-brlcad-extension.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: brlcad/trunk/misc/debian/brlcad-archer.desktop
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-archer.desktop
___________________________________________________________________
Added: svn:mime-type
+ application/x-desktop
Added: brlcad/trunk/misc/debian/brlcad-archer.png
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-archer.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Deleted: brlcad/trunk/misc/debian/brlcad-bin.docs
===================================================================
--- brlcad/trunk/misc/debian/brlcad-bin.docs 2011-01-28 21:01:16 UTC (rev
42727)
+++ brlcad/trunk/misc/debian/brlcad-bin.docs 2011-01-28 21:03:00 UTC (rev
42728)
@@ -1,8 +0,0 @@
-AUTHORS
-BUGS
-ChangeLog
-HACKING
-NEWS
-README
-TODO
-
Deleted: brlcad/trunk/misc/debian/brlcad-bin.install
===================================================================
--- brlcad/trunk/misc/debian/brlcad-bin.install 2011-01-28 21:01:16 UTC (rev
42727)
+++ brlcad/trunk/misc/debian/brlcad-bin.install 2011-01-28 21:03:00 UTC (rev
42728)
@@ -1,10 +0,0 @@
-usr/bin/
-usr/lib/*.so.*
-usr/lib/*.a
-usr/lib/Tkhtml3.0/pkgIndex.tcl
-usr/lib/Tkhtml3.0/libTkhtml3.0.so
-usr/lib/Tktable2.10/tktable.py
-usr/lib/Tktable2.10/libTktable2.10.so
-usr/lib/Tktable2.10/pkgIndex.tcl
-usr/lib/Tktable2.10/tkTable.tcl
-usr/share/man/
\ No newline at end of file
Deleted: brlcad/trunk/misc/debian/brlcad-bin.lintian-overrides
===================================================================
--- brlcad/trunk/misc/debian/brlcad-bin.lintian-overrides 2011-01-28
21:01:16 UTC (rev 42727)
+++ brlcad/trunk/misc/debian/brlcad-bin.lintian-overrides 2011-01-28
21:03:00 UTC (rev 42728)
@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libanalyze19 libbn19 libbrlcad19 libbu19
libcursor19 libdm19 libexppp19 libexpress19 libfb19 libfft19 libgcv19 libged19
libicv19 libmultispectral19 libopenNURBS0 liboptical19 liborle19 libpkg19
librender0 librt19 libstepcore19 libstepdai19 libstepeditor19 libsteputils19
libsysv19 libtermio19 libtie0 libutahrle19 libwdb19
\ No newline at end of file
Deleted: brlcad/trunk/misc/debian/brlcad-data.install
===================================================================
--- brlcad/trunk/misc/debian/brlcad-data.install 2011-01-28 21:01:16 UTC
(rev 42727)
+++ brlcad/trunk/misc/debian/brlcad-data.install 2011-01-28 21:03:00 UTC
(rev 42728)
@@ -1,2 +0,0 @@
-usr/share/brlcad
-
Added: brlcad/trunk/misc/debian/brlcad-db.desktop
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-db.desktop
___________________________________________________________________
Added: svn:mime-type
+ application/x-desktop
Added: brlcad/trunk/misc/debian/brlcad-db.png
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-db.png
___________________________________________________________________
Added: svn:special
+ *
Added: svn:mime-type
+ inode/symlink
Deleted: brlcad/trunk/misc/debian/brlcad-dev.install
===================================================================
--- brlcad/trunk/misc/debian/brlcad-dev.install 2011-01-28 21:01:16 UTC (rev
42727)
+++ brlcad/trunk/misc/debian/brlcad-dev.install 2011-01-28 21:03:00 UTC (rev
42728)
@@ -1,4 +0,0 @@
-usr/include
-usr/lib/*.so
-usr/lib/*.la
-usr/lib/pkgconfig
\ No newline at end of file
Added: brlcad/trunk/misc/debian/brlcad-doc.desktop
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-doc.desktop
___________________________________________________________________
Added: svn:mime-type
+ application/x-desktop
Added: brlcad/trunk/misc/debian/brlcad-doc.directory
===================================================================
--- brlcad/trunk/misc/debian/brlcad-doc.directory
(rev 0)
+++ brlcad/trunk/misc/debian/brlcad-doc.directory 2011-01-28 21:03:00 UTC
(rev 42728)
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Directory
+Icon=folder
+Name=Documents
Property changes on: brlcad/trunk/misc/debian/brlcad-doc.directory
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: brlcad/trunk/misc/debian/brlcad-doc.install
===================================================================
--- brlcad/trunk/misc/debian/brlcad-doc.install 2011-01-28 21:01:16 UTC (rev
42727)
+++ brlcad/trunk/misc/debian/brlcad-doc.install 2011-01-28 21:03:00 UTC (rev
42728)
@@ -1 +0,0 @@
-usr/share/doc
\ No newline at end of file
Added: brlcad/trunk/misc/debian/brlcad-doc.png
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-doc.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: brlcad/trunk/misc/debian/brlcad-mged.desktop
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-mged.desktop
___________________________________________________________________
Added: svn:mime-type
+ application/x-desktop
Added: brlcad/trunk/misc/debian/brlcad-rtwizard.desktop
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad-rtwizard.desktop
___________________________________________________________________
Added: svn:mime-type
+ application/x-desktop
Added: brlcad/trunk/misc/debian/brlcad.directory
===================================================================
--- brlcad/trunk/misc/debian/brlcad.directory (rev 0)
+++ brlcad/trunk/misc/debian/brlcad.directory 2011-01-28 21:03:00 UTC (rev
42728)
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Directory
+Icon=brlcad
+Name=BRL-CAD
Property changes on: brlcad/trunk/misc/debian/brlcad.directory
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/misc/debian/brlcad.docs
===================================================================
--- brlcad/trunk/misc/debian/brlcad.docs (rev 0)
+++ brlcad/trunk/misc/debian/brlcad.docs 2011-01-28 21:03:00 UTC (rev
42728)
@@ -0,0 +1,8 @@
+AUTHORS
+BUGS
+ChangeLog
+HACKING
+NEWS
+README
+TODO
+
Property changes on: brlcad/trunk/misc/debian/brlcad.docs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/misc/debian/brlcad.install
===================================================================
--- brlcad/trunk/misc/debian/brlcad.install (rev 0)
+++ brlcad/trunk/misc/debian/brlcad.install 2011-01-28 21:03:00 UTC (rev
42728)
@@ -0,0 +1,16 @@
+usr/brlcad/
+debian/brlcad.sh etc/profile.d
+debian/brlcad.menu etc/xdg/menus/applications-merged
+debian/brlcad-archer.desktop usr/share/applications
+debian/brlcad-mged.desktop usr/share/applications
+debian/brlcad-rtwizard.desktop usr/share/applications
+debian/brlcad-db.desktop usr/share/applications
+debian/brlcad-doc.desktop usr/share/applications
+debian/brlcad.directory usr/share/desktop-directories
+debian/brlcad-doc.directory usr/share/desktop-directories
+debian/brlcad.png usr/share/icons/hicolor/48x48/apps
+debian/brlcad-archer.png usr/share/icons/hicolor/48x48/apps
+debian/brlcad-db.png usr/share/icons/hicolor/48x48/apps
+debian/brlcad-doc.png usr/share/icons/hicolor/48x48/apps
+debian/application-x-brlcad-extension.png
usr/share/icons/hicolor/48x48/mimetypes
+debian/application-x-brlcad-extension.xml usr/share/mime/packages
Property changes on: brlcad/trunk/misc/debian/brlcad.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/misc/debian/brlcad.menu
===================================================================
--- brlcad/trunk/misc/debian/brlcad.menu (rev 0)
+++ brlcad/trunk/misc/debian/brlcad.menu 2011-01-28 21:03:00 UTC (rev
42728)
@@ -0,0 +1,20 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd";>
+
+<Menu>
+ <Name>Applications</Name>
+ <Menu>
+ <Name>brlcad</Name>
+ <Directory>brlcad.directory</Directory>
+ <Include>
+ <Category>BRL-CAD</Category>
+ </Include>
+ <Menu>
+ <Name>brlcad-doc</Name>
+ <Directory>brlcad-doc.directory</Directory>
+ <Include>
+ <Category>BRL-CAD-doc</Category>
+ </Include>
+ </Menu>
+ </Menu>
+</Menu>
Property changes on: brlcad/trunk/misc/debian/brlcad.menu
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/misc/debian/brlcad.png
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: brlcad/trunk/misc/debian/brlcad.postinst
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad.postinst
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/x-shellscript
Added: brlcad/trunk/misc/debian/brlcad.postrm
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad.postrm
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/x-shellscript
Added: brlcad/trunk/misc/debian/brlcad.sh
===================================================================
(Binary files differ)
Property changes on: brlcad/trunk/misc/debian/brlcad.sh
___________________________________________________________________
Added: svn:mime-type
+ application/x-shellscript
Modified: brlcad/trunk/misc/debian/changelog
===================================================================
--- brlcad/trunk/misc/debian/changelog 2011-01-28 21:01:16 UTC (rev 42727)
+++ brlcad/trunk/misc/debian/changelog 2011-01-28 21:03:00 UTC (rev 42728)
@@ -1,3 +1,42 @@
+brlcad (7.18.0-0) unstable; urgency=low
+
+ This release includes the initial release of a new Bag of Triangle
+ (BoT) editing interface for MGED and Archer. Nicholas Reed developed
+ the new graphical user interface (GUI) in order to consolidate the
+ numerous BoT editing commands and processing steps into one unified
+ easy-to-use interface. The new GUI grealy simplifies BoT processing
+ steps and can save modelers considerable time.
+
+ * ported benchmark suite to Windows (requires 'sh') - Erik Greenwald
+ * improved NURBS wireframes with interior surface lines - Keith Bowman
+ * additional NURBS raytracing robustness improvements - Keith Bowman
+ * removed pl-sgi plot tool - Sean Morrison
+ * expanded rtarea documentation with examples and detail - Cliff Yapp
+ * improved support for unlimited object counts in mged - Sean Morrison
+ * fixed 'erase_all' behavior so 'who' gives correct lists - Bob Parker
+ * fixed idents, solids, and regions output - Bob Parker
+ * increased performance of facetization and export - Sean Morrison
+ * fixed NURBS raytrace bug grazing nearly flat surfaces - Keith Bowman
+ * fixed infinite loop bug converting to NMG and BoT - Sean Morrison
+ * improved Windows installer desktop shortcut creation - Bob Parker
+ * fixed running mged external tools (e.g., rt) after 'cd' - Bob Parker
+ * fixed 'pnts' point cloud primitive memory access bug - Richard Weiss
+ * new BoT editing interface for mged and archer - Nicholas Reed
+ * fixed crash during BoT decimation - Nicholas Reed
+ * improved robustness of CSG boolean tree processing - Sean Morrison
+ * improved loading of Pro/E export plugin on Windows - Bob Parker
+ * added ray bundle shooting capability to rtshot - Keith Bowman
+ * improved robustness of facetization and export - Richard Weiss
+ * cleaner logging of facetize command BoT failures - Sean Morrison
+ * removed 'query' command line prompting tool - Sean Morrison
+ * increased optimized package run-time performance - Sean Morrison
+ * fixed crash when raytracing multiple frames - Keith Bowman
+ * fixed mged zap crash while using preview - Keith Bowman, Bob Parker
+ * added ability to toggle mged status bar via .mgedrc - Rob Shinn
+ * new mged 'bot' command for accessing BoT properties - Nicholas Reed
+
+ -- Jordi Sayol <g.sa...@yahoo.es> Thu, 27 Jan 2011 15:18:03 +0100
+
brlcad (7.16.10-1) unstable; urgency=low
* Initial release (Closes: #289632).
Modified: brlcad/trunk/misc/debian/control
===================================================================
--- brlcad/trunk/misc/debian/control 2011-01-28 21:01:16 UTC (rev 42727)
+++ brlcad/trunk/misc/debian/control 2011-01-28 21:03:00 UTC (rev 42728)
@@ -1,18 +1,16 @@
Source: brlcad
-Section: science
+Section: graphics
Priority: extra
-Maintainer: Manuel A. Fernandez Montecelo <manuel.montez...@gmail.com>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.0), make (>= 3.8.0), bison, flex,
libncurses5-dev, xserver-xorg-dev, libx11-dev, libxi-dev, libpng-dev,
zlib1g-dev, tcl8.5-dev (>= 8.5), tk8.5-dev (>= 8.5), itcl3-dev, itk3-dev,
iwidgets4, libtk-img-dev, blt-dev, libtnt-dev (>> 1.2.6), libjama-dev (>>
1.2.4), xsltproc
+Maintainer: Jordi Sayol <g.sa...@yahoo.es>
+Build-Depends: debhelper (>= 7.0.0), make (>= 3.8.0), bison, flex, libxi-dev,
xsltproc, libgl1-mesa-dev, libfontconfig1-dev
Standards-Version: 3.9.1
Homepage: http://brlcad.org/
Vcs-Svn: https://brlcad.svn.sourceforge.net/svnroot/brlcad/
Vcs-Browser: http://brlcad.svn.sourceforge.net/viewvc/brlcad/
-Package: brlcad-bin
+Package: brlcad
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, brlcad-data (= ${source:Version})
-Suggests: brlcad-dev (= ${source:Version}), brlcad-doc (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Constructive Solid Geometry (CSG) solid modeling system, binary
files
BRL-CAD is a powerful cross-platform open source combinatorial
Constructive Solid Geometry (CSG) solid modeling system that includes
@@ -25,61 +23,3 @@
libraries, a system performance analysis benchmark suite, an embedded
scripting interface, and a robust high-performance geometric
representation and analysis library.
- .
- This package contains binaries and libraries.
-
-Package: brlcad-data
-Architecture: all
-Depends: ${misc:Depends}
-Description: Constructive Solid Geometry (CSG) solid modeling system, data
files
- BRL-CAD is a powerful cross-platform open source combinatorial
- Constructive Solid Geometry (CSG) solid modeling system that includes
- an interactive 3D solid geometry editor, a network-distributed
- symmetric multiprocessing high-performance ray-tracer,
- network-distributed framebuffer support, image and signal-processing
- tools, ray-tracing support for rendering and geometric analysis,
- path-tracing and photon mapping support for realistic image synthesis,
- animation capabilities, ray-tracing and numerical processing
- libraries, a system performance analysis benchmark suite, an embedded
- scripting interface, and a robust high-performance geometric
- representation and analysis library.
- .
- This package contains data needed by the binaries.
-
-Package: brlcad-dev
-Section: devel
-Architecture: all
-Depends: ${misc:Depends}
-Description: Constructive Solid Geometry (CSG) solid modeling system,
development files
- BRL-CAD is a powerful cross-platform open source combinatorial
- Constructive Solid Geometry (CSG) solid modeling system that includes
- an interactive 3D solid geometry editor, a network-distributed
- symmetric multiprocessing high-performance ray-tracer,
- network-distributed framebuffer support, image and signal-processing
- tools, ray-tracing support for rendering and geometric analysis,
- path-tracing and photon mapping support for realistic image synthesis,
- animation capabilities, ray-tracing and numerical processing
- libraries, a system performance analysis benchmark suite, an embedded
- scripting interface, and a robust high-performance geometric
- representation and analysis library.
- .
- This package contains the development files.
-
-Package: brlcad-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: Constructive Solid Geometry (CSG) solid modeling system,
documentation
- BRL-CAD is a powerful cross-platform open source combinatorial
- Constructive Solid Geometry (CSG) solid modeling system that includes
- an interactive 3D solid geometry editor, a network-distributed
- symmetric multiprocessing high-performance ray-tracer,
- network-distributed framebuffer support, image and signal-processing
- tools, ray-tracing support for rendering and geometric analysis,
- path-tracing and photon mapping support for realistic image synthesis,
- animation capabilities, ray-tracing and numerical processing
- libraries, a system performance analysis benchmark suite, an embedded
- scripting interface, and a robust high-performance geometric
- representation and analysis library.
- .
- This package contains the documentation.
Modified: brlcad/trunk/misc/debian/copyright
===================================================================
--- brlcad/trunk/misc/debian/copyright 2011-01-28 21:01:16 UTC (rev 42727)
+++ brlcad/trunk/misc/debian/copyright 2011-01-28 21:03:00 UTC (rev 42728)
@@ -1,5 +1,5 @@
-This package was debianized by: Manuel A. Fernandez Montecelo
-<manuel.montez...@gmail.com> on 2010-08-25 10:12:35 UTC
+This package was debianized by: Jordi Sayol <g.sa...@yahoo.es>
+on Thu, 27 Jan 2011 15:18:03 +0100
It was downloaded from: http://brlcad.org/
@@ -22,7 +22,7 @@
and all contributions being made. The following notice should be
prominent in the BRL-CAD sources:
- Copyright (c) 1984-2011 United States Government as represented by
+ Copyright (c) 1984-2010 United States Government as represented by
the U.S. Army Research Laboratory.
License:
Modified: brlcad/trunk/misc/debian/rules
===================================================================
--- brlcad/trunk/misc/debian/rules 2011-01-28 21:01:16 UTC (rev 42727)
+++ brlcad/trunk/misc/debian/rules 2011-01-28 21:03:00 UTC (rev 42728)
@@ -1,37 +1,17 @@
#!/usr/bin/make -f
-# Author: Manuel A. Fernandez Montecelo <manuel.montez...@gmail.com>
+# Author: Jordi Sayol <g.sa...@yahoo.es>
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# DEB_BUILD_OPTIONS
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
- PARALLEL_JOBS = $(shell echo $(DEB_BUILD_OPTIONS) | \
- sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
- PARALLEL_OPTIONS = -j$(PARALLEL_JOBS)
-endif
-# DEB_BUILD_OPTIONS
-
-
build: build-stamp
build-stamp:
dh_testdir
- ./configure --enable-optimized --prefix=/usr \
- --with-cppflags="-I/usr/include/tcl8.5" \
- --with-tkinclude="/usr/include/tcl8.5" \
- --with-tclconfig="/usr/share/tcltk/tcl8.5/" \
- --with-tkconfig="/usr/share/tcltk/tk8.5/" \
- --disable-build-all --enable-urt --enable-opennurbs
--enable-tnt --enable-tkhtml3 && \
- $(MAKE) $(PARALLEL_OPTIONS)
+ ./configure --enable-optimized --enable-almost-everything --with-ogl
--disable-debug && \
+ $(MAKE)
touch build-stamp
@@ -39,8 +19,7 @@
dh_testdir
dh_testroot
-# not supported...
-# make clean
+ #make clean
dh_clean
@@ -54,51 +33,13 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-# Remove files, we're not going to ship them
- rm -f debian/tmp/usr/lib/Tktable2.10/README.txt
- rm -f debian/tmp/usr/lib/Tktable2.10/license.txt
- rm -f debian/tmp/usr/lib/Tktable2.10/usr/lib/Tktable2.10/license.txt
- rm -fr debian/tmp/usr/lib/Tktable2.10/html
- rm -fr debian/tmp/usr/share/scl
- rm -fr debian/tmp/usr/share/brlcad/*/pdf
-
-# Move documentation
- mkdir -p debian/tmp/usr/share/doc/brlcad
- mv debian/tmp/usr/share/brlcad/*/doc debian/tmp/usr/share/doc/brlcad
- mv debian/tmp/usr/share/brlcad/*/html
debian/tmp/usr/share/doc/brlcad/html
-
-# Move man pages
- mkdir -p debian/tmp/usr/share/man/man3
- mv debian/tmp/usr/man/mann/* debian/tmp/usr/share/man/man3/
- mv debian/tmp/usr/man debian/tmp/usr/share/man
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install -i --list-missing
- dh_installdocs -i
- dh_installchangelogs -i
- dh_installmime -i
- dh_installman -i
- dh_lintian -i
- dh_icons -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
- dh_install -a --list-missing
dh_installdocs -a
dh_installchangelogs -a
- dh_installman -a
- dh_lintian -a
+ dh_install -a --list-missing
dh_strip -a
dh_compress -a
dh_fixperms -a
@@ -109,5 +50,5 @@
dh_md5sums -a
dh_builddeb -a
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch clean
+.PHONY: build clean binary-arch binary install
Deleted: brlcad/trunk/misc/debian/watch
===================================================================
--- brlcad/trunk/misc/debian/watch 2011-01-28 21:01:16 UTC (rev 42727)
+++ brlcad/trunk/misc/debian/watch 2011-01-28 21:03:00 UTC (rev 42728)
@@ -1,3 +0,0 @@
-version=3
-http://sf.net/brlcad/brlcad-(.+)\.tar\.bz2
-
Modified: brlcad/trunk/sh/make_deb.sh
===================================================================
--- brlcad/trunk/sh/make_deb.sh 2011-01-28 21:01:16 UTC (rev 42727)
+++ brlcad/trunk/sh/make_deb.sh 2011-01-28 21:03:00 UTC (rev 42728)
@@ -2,7 +2,7 @@
# M A K E _ D E B . S H
# BRL-CAD
#
-# Copyright (c) 2005-2011 United States Government as represented by
+# Copyright (c) 2005-2010 United States Government as represented by
# the U.S. Army Research Laboratory.
#
# Redistribution and use in source and binary forms, with or without
@@ -35,28 +35,68 @@
#
###
-set -e
+test -e
if test ! -e /etc/debian_version ; then
echo "Refusing to build on a non-debian system."
exit 1
fi
-if test ! -e /usr/bin/fakeroot ; then
- echo "Need the fakeroot package."
+# needed packages
+E=0
+fcheck(){
+ if test `dpkg -s $1 2>/dev/null | grep "install ok installed" | wc -l` -eq
0 ; then
+ LLIST=$LLIST"\n"$1
+ E=1
+ fi
+}
+
+fcheck build-essential
+fcheck fakeroot
+fcheck debhelper
+fcheck bison
+fcheck flex
+fcheck libxi-dev
+fcheck xsltproc
+fcheck libgl1-mesa-dev
+
+if [ $E -eq 1 ]; then
+ echo "=========================================================="
+ echo "Mandatory to install these packages first:"
+ echo $LLIST
+ echo "=========================================================="
exit 1
fi
-if test ! -e /usr/bin/debuild ; then
- echo "Need the devscripts package."
- exit 1
+fcheck libpango1.0-dev
+
+if [ $E -eq 1 ]; then
+ echo "=========================================================="
+ echo "For a better font rendering, install this package first:"
+ echo $LLIST
+ echo "=========================================================="
+ echo "Pausing 15 seconds..."
+ sleep 15
fi
+# needed packages
+# modify the doc menu entries
+B_VERSION=`cat include/conf/MAJOR`"."`cat include/conf/MINOR`"."`cat
include/conf/PATCH`
+
+F="misc/debian/brlcad-doc.desktop"
+sed -i '/Exec=/d' $F
+echo "Exec=xdg-open /usr/brlcad/share/brlcad/$B_VERSION/html/toc.html" >> $F
+
+F="misc/debian/brlcad-db.desktop"
+sed -i '/Exec=/d' $F
+echo "Exec=xdg-open /usr/brlcad/share/brlcad/$B_VERSION/db" >> $F
+# modify the doc menu entries
+
if test ! -e ./debian && test ! -e ./debian/control ; then
ln -fs misc/debian debian
fi
-fakeroot debian/rules binary && debuild -us -uc
+fakeroot debian/rules binary
if test -L ./debian ; then rm debian ; fi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
