r38383 - in /packages/libblitz/trunk/debian: changelog compat control libblitz-doc.links rules

[tille at users.alioth.debian.org]

Author: tille
Date: Fri Apr 15 07:43:15 2011
New Revision: 38383

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38383
Log:
  * debian/control:
    - Standards-Version: 3.9.2 (no changes needed)
    - Build-Depends: texi2html
    - doc package Depends libjs-jquery which provides jquery.js
  * Debhelper 8 (control+compat)
  * debian/rules:
    - Fix sequence of dh arguments
    - Do not install unneeded *.la file
      Closes: #621305
    - Remove copy of jquery.js which is provided by a link to the
      file provided in libjs-jquery:

Added:
    packages/libblitz/trunk/debian/libblitz-doc.links
Modified:
    packages/libblitz/trunk/debian/changelog
    packages/libblitz/trunk/debian/compat
    packages/libblitz/trunk/debian/control
    packages/libblitz/trunk/debian/rules

Modified: packages/libblitz/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/changelog?rev=38383&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/changelog (original)
+++ packages/libblitz/trunk/debian/changelog Fri Apr 15 07:43:15 2011
@@ -1,3 +1,19 @@
+blitz++ (1:0.9-12) unstable; urgency=low
+
+  * debian/control:
+    - Standards-Version: 3.9.2 (no changes needed)
+    - Build-Depends: texi2html
+    - doc package Depends libjs-jquery which provides jquery.js
+  * Debhelper 8 (control+compat)
+  * debian/rules:
+    - Fix sequence of dh arguments
+    - Do not install unneeded *.la file
+      Closes: #621305
+    - Remove copy of jquery.js which is provided by a link to the
+      file provided in libjs-jquery:
+
+ -- Andreas Tille <tille at debian.org>  Fri, 08 Apr 2011 13:51:07 +0200
+
 blitz++ (1:0.9-11) unstable; urgency=low
 
   * debian/control:

Modified: packages/libblitz/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/compat?rev=38383&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/compat (original)
+++ packages/libblitz/trunk/debian/compat Fri Apr 15 07:43:15 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/libblitz/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/control?rev=38383&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/control (original)
+++ packages/libblitz/trunk/debian/control Fri Apr 15 07:43:15 2011
@@ -6,8 +6,8 @@
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: gfortran | fortran-compiler, autotools-dev, texinfo,
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev,
- debhelper (>= 7.1), d-shlibs, doxygen-latex, quilt
-Standards-Version: 3.9.1
+ debhelper (>= 8), d-shlibs, doxygen-latex, quilt, texi2html
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libblitz/trunk/
 Homepage: http://oonumerics.org/blitz/
@@ -48,7 +48,7 @@
 Package: libblitz-doc
 Architecture: all
 Priority: extra
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Section: doc
 Description: C++ template class library for scientific computing
  Blitz++ offers a high level of abstraction, 

Added: packages/libblitz/trunk/debian/libblitz-doc.links
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/libblitz-doc.links?rev=38383&op=file
==============================================================================
--- packages/libblitz/trunk/debian/libblitz-doc.links (added)
+++ packages/libblitz/trunk/debian/libblitz-doc.links Fri Apr 15 07:43:15 2011
@@ -1,0 +1,1 @@
+usr/share/javascript/jquery/jquery.js	usr/share/doc/libblitz-doc/html/doxygen/jquery.js

Modified: packages/libblitz/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libblitz/trunk/debian/rules?rev=38383&op=diff
==============================================================================
--- packages/libblitz/trunk/debian/rules (original)
+++ packages/libblitz/trunk/debian/rules Fri Apr 15 07:43:15 2011
@@ -5,11 +5,12 @@
 version=0.9
 libname=libblitz
 pkgname=$(libname)0ldbl
+docname=$(libname)-doc
 
 PREFIX = /usr
 
 %:
-	dh --with autotools-dev $@
+	dh $@ -with autotools-dev
 	# dh --with autotools-dev --with autoreconf $@ # Needs Build-Depends: dh-autoreconf
 
 override_dh_auto_configure:
@@ -34,7 +35,11 @@
 	done
 	d-shlibmove --ldbl --commit \
 	            --movedev "debian/tmp/usr/lib/pkgconfig/*" usr/lib/pkgconfig \
-	            --movedev "debian/tmp/usr/lib/*.la" usr/lib \
 	            lib/.libs/libblitz.so
 
-##	            --movedev "debian/tmp/usr/include/*" usr/include \
+	#######    --movedev "debian/tmp/usr/lib/*.la" usr/lib \
+	# Make sure there will be no *.la file created automagically by d-shlibmove
+	find debian -name "*.la" -delete
+
+	# Delete copy of jquery.js and replace it by a link (in dh_links) to libjs-jquery version
+	rm -f debian/$(docname)/usr/share/doc/$(docname)/html/doxygen/jquery.js