r38253 - in /packages/rheolef/trunk/debian: changelog gzip_man_info.sh librheolef-dev.install librheolefX.X.overrides rheolef-doc.doc-base.refman rheolef-doc.doc-base.usrman rheolef-doc.install rules shlibs.librheolefX.X

saramito-guest at users.alioth.debian.org saramito-guest at users.alioth.debian.org
Sun Mar 27 12:50:12 UTC 2011 

Author: saramito-guest
Date: Sun Mar 27 12:49:58 2011
New Revision: 38253

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38253
Log:
debian/rules: clean some useless steps
add doc refman in .info format, and refman in doc-base

Added:
    packages/rheolef/trunk/debian/rheolef-doc.doc-base.refman
Removed:
    packages/rheolef/trunk/debian/gzip_man_info.sh
Modified:
    packages/rheolef/trunk/debian/changelog
    packages/rheolef/trunk/debian/librheolef-dev.install
    packages/rheolef/trunk/debian/librheolefX.X.overrides
    packages/rheolef/trunk/debian/rheolef-doc.doc-base.usrman
    packages/rheolef/trunk/debian/rheolef-doc.install
    packages/rheolef/trunk/debian/rules
    packages/rheolef/trunk/debian/shlibs.librheolefX.X

Modified: packages/rheolef/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/changelog?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/changelog (original)
+++ packages/rheolef/trunk/debian/changelog Sun Mar 27 12:49:58 2011
@@ -1,9 +1,17 @@
+rheolef (5.93-2) unstable; urgency=low
+
+  * debian/rheolef-doc.install: 
+    - add doc refman in .info format, and refman in doc-base
+    - debian/rules: clean some useless steps
+
+ -- Pierre Saramito <pierre.saramito at imag.fr>  Thu, 26 March 2011 08:10:11 +0200
+
 rheolef (5.93-1) unstable; urgency=low
 
   * New upstream release (minor changes):
     - some extra warning message deleted in heap_allocator
     - graphic output with mayavi2 fixed
-    - add doc refman in .info and .pdf format
+    - add doc refman in .pdf format
 
  -- Pierre Saramito <pierre.saramito at imag.fr>  Thu, 23 March 2011 11:14:26 +0200
 

Modified: packages/rheolef/trunk/debian/librheolef-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/librheolef-dev.install?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/librheolef-dev.install (original)
+++ packages/rheolef/trunk/debian/librheolef-dev.install Sun Mar 27 12:49:58 2011
@@ -1,7 +1,11 @@
 usr/lib/librheolef.so
 usr/include/*
 usr/lib/rheolef/*.{h,mk}
+usr/share/man/man2/*
 usr/share/man/man3/*
+usr/share/man/man4/*
 usr/share/man/man5/*
+usr/share/man/man6/*
 usr/share/man/man7/*
+usr/share/man/man8/*
 usr/share/man/man9/*

Modified: packages/rheolef/trunk/debian/librheolefX.X.overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/librheolefX.X.overrides?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/librheolefX.X.overrides (original)
+++ packages/rheolef/trunk/debian/librheolefX.X.overrides Sun Mar 27 12:49:58 2011
@@ -1,1 +1,1 @@
- at LIBRARY@: package-name-doesnt-match-sonames librheolef- at VERSION@- at MAJOR_VERSION@
+ at LIBRHEOLEF@: package-name-doesnt-match-sonames librheolef- at VERSION@- at MAJOR_VERSION@

Added: packages/rheolef/trunk/debian/rheolef-doc.doc-base.refman
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rheolef-doc.doc-base.refman?rev=38253&op=file
==============================================================================
--- packages/rheolef/trunk/debian/rheolef-doc.doc-base.refman (added)
+++ packages/rheolef/trunk/debian/rheolef-doc.doc-base.refman Sun Mar 27 12:49:58 2011
@@ -1,0 +1,16 @@
+Document: rheolef-refman
+Title: Rheolef Library - Reference Manual
+Author: Pierre Saramito, Jocelyn Etienne
+Abstract: Rheolef is a computer environment that serves as a convenient laboratory for computations in applied mathematics, involving finite element-like methods. It provides a set of unix commands and C++ algorithms and containers.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/rheolef-doc/rheolef-refman.html
+Files: /usr/share/doc/rheolef-doc/rheolef-refman*.html
+
+Format: Info
+Index: /usr/share/info/rheolef.info.gz
+Files: /usr/share/info/rheolef*.info.gz
+
+Format: PDF
+Files: /usr/share/doc/rheolef-doc/rheolef-refman.pdf

Modified: packages/rheolef/trunk/debian/rheolef-doc.doc-base.usrman
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rheolef-doc.doc-base.usrman?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/rheolef-doc.doc-base.usrman (original)
+++ packages/rheolef/trunk/debian/rheolef-doc.doc-base.usrman Sun Mar 27 12:49:58 2011
@@ -1,8 +1,8 @@
-Document: librheolef-usrman
+Document: rheolef-usrman
 Title: Rheolef Library - User Manual
 Author: Pierre Saramito, Jocelyn Etienne
 Abstract: Rheolef is a computer environment that serves as a convenient laboratory for computations in applied mathematics, involving finite element-like methods. It provides a set of unix commands and C++ algorithms and containers.
 Section: Science/Mathematics
 
 Format: PDF
-Files: /usr/share/doc/librheolef-doc/rheolef.pdf
+Files: /usr/share/doc/rheolef-doc/rheolef.pdf

Modified: packages/rheolef/trunk/debian/rheolef-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rheolef-doc.install?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/rheolef-doc.install (original)
+++ packages/rheolef/trunk/debian/rheolef-doc.install Sun Mar 27 12:49:58 2011
@@ -1,1 +1,2 @@
 usr/share/doc/*
+usr/share/info/*

Modified: packages/rheolef/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rules?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/rules (original)
+++ packages/rheolef/trunk/debian/rules Sun Mar 27 12:49:58 2011
@@ -10,17 +10,18 @@
 #export DH_VERBOSE=1
 
 # Variables declaration
+ABI_VERSION=1
 VERSION=$(shell cat VERSION | sed -e 's/\([0-9]*\.[0-9]*\)-[0-9]*/\1/')
 MAJOR_VERSION=$(shell cat VERSION | sed -e 's/\([0-9]*\)\.[0-9]*/\1/')
 MINOR_VERSION=$(shell cat VERSION | sed -e 's/[0-9]*\.\([0-9]*\)/\1/')
 SONAME=$(MAJOR_VERSION)
-ABI_VERSION=1
+
 LIBRHEOLEF=librheolef${ABI_VERSION}
 LIBRHEOLEF_DEV=librheolef-dev
 RHEOLEF_DOC=rheolef-doc
 RHEOLEF_RUNTIME=rheolef
+
 TMPDIR=debian/tmp-rheolef
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -33,13 +34,13 @@
 configure-stamp:
 	# Prepare the debian control files necessary for the creation of the packages
 	cat debian/shlibs.librheolefX.X | \
-	  sed -e "s/\@LIBRARY\@/$(LIBRHEOLEF)/g" \
+	  sed -e "s/\@LIBRHEOLEF\@/$(LIBRHEOLEF)/g" \
               -e "s/\@MAJOR_VERSION\@/$(MAJOR_VERSION)/g" \
               -e "s/\@MINOR_VERSION\@/$(MINOR_VERSION)/g" \
               -e "s/\@VERSION\@/$(VERSION)/g" \
               -e "s/\@SONAME\@/$(SONAME)/g" > debian/shlibs.$(LIBRHEOLEF)
 	cat debian/librheolefX.X.overrides | \
-	  sed -e "s/\@LIBRARY\@/$(LIBRHEOLEF)/g" \
+	  sed -e "s/\@LIBRHEOLEF\@/$(LIBRHEOLEF)/g" \
               -e "s/\@MAJOR_VERSION\@/$(MAJOR_VERSION)/g" \
               -e "s/\@MINOR_VERSION\@/$(MINOR_VERSION)/g" \
               -e "s/\@VERSION\@/$(VERSION)/g" \
@@ -49,7 +50,7 @@
 	cp -f debian/librheolefX.X.substvars debian/$(LIBRHEOLEF).substvars
 	dh_testdir
 	./bootstrap
-	CC=gcc CXX=g++ ./configure --enable-fast-install --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-optim --with-umfpack --enable-debian-packaging=yes
+	CC=gcc CXX=g++ ./configure --enable-fast-install --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-optim --with-umfpack
 	touch configure-stamp
 
 build: build-stamp
@@ -59,9 +60,6 @@
 
 	# Compile the package.
 	$(MAKE)
-
-	# Gzip man and info pages.
-	sh debian/gzip_man_info.sh
 	touch build-stamp
 
 clean:
@@ -83,11 +81,18 @@
 
 	# Add here commands to install the package into DESTDIR
 	$(MAKE) install DESTDIR=$(CURDIR)/$(TMPDIR)
-
 	dh_movefiles --sourcedir=$(TMPDIR)
 
-	# Removing some useless scripts (doc2man, etc.)
-	rm -f $(TMPDIR)/usr/bin/doc*
+	# removing some useless progs
+	rm -f $(TMPDIR)/usr/bin/doc2man
+	rm -f $(TMPDIR)/usr/bin/doc2texi
+	rm -f $(TMPDIR)/usr/bin/doc2oxy
+
+	# remove info/dir
+	rm -f $(TMPDIR)/usr/share/info/dir*
+
+	# respect debian naming conventions
+	test -d $(TMPDIR)/usr/share/doc/rheolef && mv $(TMPDIR)/usr/share/doc/rheolef $(TMPDIR)/usr/share/doc/rheolef-doc
 
 	# Changing file access permissions
 	chmod 755 $(TMPDIR)/usr/share/rheolef/check-shlibpath_var.sh

Modified: packages/rheolef/trunk/debian/shlibs.librheolefX.X
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/shlibs.librheolefX.X?rev=38253&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/shlibs.librheolefX.X (original)
+++ packages/rheolef/trunk/debian/shlibs.librheolefX.X Sun Mar 27 12:49:58 2011
@@ -1,1 +1,1 @@
-librheolef- at VERSION@ @SONAME@ @LIBRARY at .so.@MAJOR_VERSION at .0.@MINOR_VERSION@
+librheolef- at VERSION@ @SONAME@ @LIBRHEOLEF at .so.@MAJOR_VERSION at .0.@MINOR_VERSION@

More information about the debian-science-commits mailing list