[Pkg-octave-commit] rev 301 - trunk/packages/sundials/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-01 17:11:44 +0000 (Tue, 01 Nov 2005)
New Revision: 301

Modified:
   trunk/packages/sundials/debian/changelog
   trunk/packages/sundials/debian/control
   trunk/packages/sundials/debian/libsundials-serial-dev.install
   trunk/packages/sundials/debian/libsundials-serial-doc.install
   trunk/packages/sundials/debian/rules
Log:
Centralize the /usr/share/doc/<pkg>* directories, by symlinking both
<pkg>-dev and <pkg>-doc to <pkg>.  This forces the dependency of
libsundails-serial-doc on libsundials-serial.


Modified: trunk/packages/sundials/debian/changelog
===================================================================
--- trunk/packages/sundials/debian/changelog	2005-10-30 22:38:46 UTC (rev 300)
+++ trunk/packages/sundials/debian/changelog	2005-11-01 17:11:44 UTC (rev 301)
@@ -7,8 +7,15 @@
   * Set Maintainer to Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
   * Create a documentation package that contains the user guides of the
     solvers
-  * Change the name of the package containing the dynamic libraries to sundials-serial
+  * Change the name of the package containing the dynamic libraries to
+    sundials-serial 
 
+  +++ Changes by Rafael Laboissiere
+  
+  * Centralize the /usr/share/doc/<pkg>* directories, by symlinking both
+    <pkg>-dev and <pkg>-doc to <pkg>.  This forces the dependency of
+    libsundails-serial-doc on libsundials-serial.
+  
  -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Wed, 26 Oct 2005 12:47:56 +0100
 
 libsundials-serial (2.1.1-2) unstable; urgency=low

Modified: trunk/packages/sundials/debian/control
===================================================================
--- trunk/packages/sundials/debian/control	2005-10-30 22:38:46 UTC (rev 300)
+++ trunk/packages/sundials/debian/control	2005-11-01 17:11:44 UTC (rev 301)
@@ -31,11 +31,12 @@
  IDA (for differential-algebraic systems), and KINSOL (for nonlinear
  algebraic systems).
  .
- Homepage: http://www.llnl.gov/CASC/sundials/ 
+ Homepage: http://www.llnl.gov/CASC/sundials/
 
 Package: libsundials-serial-doc
 Section: doc
 Architecture: any
+Depends: libsundials-serial
 Recommends: libsundials-serial-dev
 Description: SUNDIALS documentation files
  The family of solvers referred to as SUNDIALS (SUit of Nonlinear and
@@ -46,4 +47,4 @@
  .
  This package contains SUNDIALS documentation.
  .
- Homepage: http://www.llnl.gov/CASC/sundials/ 
+ Homepage: http://www.llnl.gov/CASC/sundials/

Modified: trunk/packages/sundials/debian/libsundials-serial-dev.install
===================================================================
--- trunk/packages/sundials/debian/libsundials-serial-dev.install	2005-10-30 22:38:46 UTC (rev 300)
+++ trunk/packages/sundials/debian/libsundials-serial-dev.install	2005-11-01 17:11:44 UTC (rev 301)
@@ -1,2 +1,3 @@
 usr/include/*.h usr/include/sundials
 usr/lib/lib*.a
+usr/share/doc/libsundials-serial-dev

Modified: trunk/packages/sundials/debian/libsundials-serial-doc.install
===================================================================
--- trunk/packages/sundials/debian/libsundials-serial-doc.install	2005-10-30 22:38:46 UTC (rev 300)
+++ trunk/packages/sundials/debian/libsundials-serial-doc.install	2005-11-01 17:11:44 UTC (rev 301)
@@ -1 +1,2 @@
-usr/share/doc/libsundials-serial-doc/*.pdf
+usr/share/doc/libsundials-serial-doc
+usr/share/doc/libsundials-serial/*.pdf

Modified: trunk/packages/sundials/debian/rules
===================================================================
--- trunk/packages/sundials/debian/rules	2005-10-30 22:38:46 UTC (rev 300)
+++ trunk/packages/sundials/debian/rules	2005-11-01 17:11:44 UTC (rev 301)
@@ -33,6 +33,11 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+libpkg := libsundials-serial
+debtmp := $(CURDIR)/debian/tmp
+debusr := $(debtmp)/usr
+debdoc := $(debusr)/share/doc
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
@@ -72,14 +77,15 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	install -d $(CURDIR)/debian/tmp/usr/lib
-	install -d $(CURDIR)/debian/tmp/usr/include
-	install -d $(CURDIR)/debian/tmp/usr/share/doc/libsundials-serial-doc
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
-	install $(CURDIR)/cvode/doc/cv_guide.pdf $(CURDIR)/debian/tmp/usr/share/doc/libsundials-serial-doc
-	install $(CURDIR)/cvodes/doc/cvs_guide.pdf $(CURDIR)/debian/tmp/usr/share/doc/libsundials-serial-doc
-	install $(CURDIR)/ida/doc/ida_guide.pdf $(CURDIR)/debian/tmp/usr/share/doc/libsundials-serial-doc
-	install $(CURDIR)/kinsol/doc/kin_guide.pdf $(CURDIR)/debian/tmp/usr/share/doc/libsundials-serial-doc
+	install -d $(debusr)/lib
+	install -d $(debusr)/include
+	install -d $(debdoc)/$(libpkg)
+	$(MAKE) install prefix=$(debusr)
+	install $(CURDIR)/cvode/doc/cv_guide.pdf	\
+		$(CURDIR)/cvodes/doc/cvs_guide.pdf	\
+		$(CURDIR)/ida/doc/ida_guide.pdf		\
+		$(CURDIR)/kinsol/doc/kin_guide.pdf	\
+		$(debdoc)/$(libpkg)
 
 
 # Build architecture-independent files here.
@@ -90,10 +96,12 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp
+	dh_installchangelogs --package=$(libpkg)
+	dh_installdocs --package=$(libpkg)
+	dh_installexamples 
+	ln -s $(libpkg) $(debdoc)/$(libpkg)-dev
+	ln -s $(libpkg) $(debdoc)/$(libpkg)-doc
+	dh_install --sourcedir=$(debtmp)
 	dh_installman
 	dh_link
 	dh_strip