[Pkg-octave-commit] r2178 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2008-06-23 18:26:51 +0000 (Mon, 23 Jun 2008)
New Revision: 2178

Added:
   octave/trunk/debian/in/PACKAGE.lintian-overrides
Removed:
   octave/trunk/debian/in/PACKAGE.lintian
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.dirs
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Use dh_lintian to install Lintian overrides


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-06-23 11:41:32 UTC (rev 2177)
+++ octave/trunk/debian/changelog	2008-06-23 18:26:51 UTC (rev 2178)
@@ -1,3 +1,13 @@
+octave3.0 (1:3.0.1-5) UNRELEASED; urgency=low
+
+  * debian/rules: Use dh_lintian for installing the Lintian overrides file
+  * debian/in/PACKAGE.lintian-overrides: Renamed for PACKAGE.lintian
+  * debian/control: Set build-dependency on debhelper to >= 6.0.7, since
+    dh_lintian appeared in that version
+  * debian/in/PACKAGE.dirs: Drop lintian overrides directory
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 23 Jun 2008 17:16:31 +0200
+
 octave3.0 (1:3.0.1-4) unstable; urgency=low
 
   * New patches:
@@ -4,7 +14,7 @@
     - 50_add_syspath.dpatch: Prepend library path again in the loadpath
       (closes: #477556). Thanks to Kim Hansen <kimhanse at gmail.com> for the
       patch.
-    - randn_doc.dpatch: better explanation of randn()'s return value 
+    - randn_doc.dpatch: better explanation of randn()'s return value
       (closes: #477349)
     - no_pdf_in_print.dpatch: explain that PDF generation is not possible with
       packaged gnuplot (closes: #478677)
@@ -24,7 +34,7 @@
     addpath(.../oct/) command
 
   [ Thomas Weber ]
-  * Add -dbg package 
+  * Add -dbg package
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 01 May 2008 12:49:49 +0200
 

Modified: octave/trunk/debian/in/PACKAGE.dirs
===================================================================
--- octave/trunk/debian/in/PACKAGE.dirs	2008-06-23 11:41:32 UTC (rev 2177)
+++ octave/trunk/debian/in/PACKAGE.dirs	2008-06-23 18:26:51 UTC (rev 2178)
@@ -1,5 +1,4 @@
 etc
 usr/bin
-usr/share/lintian/overrides
 usr/share/octave/debian
 [V_3_0:usr/share/enscript/hl:]

Deleted: octave/trunk/debian/in/PACKAGE.lintian
===================================================================
--- octave/trunk/debian/in/PACKAGE.lintian	2008-06-23 11:41:32 UTC (rev 2177)
+++ octave/trunk/debian/in/PACKAGE.lintian	2008-06-23 18:26:51 UTC (rev 2178)
@@ -1,3 +0,0 @@
- at PACKAGE@: binary-or-shlib-defines-rpath ./usr/bin/octave- at VERSION@ /usr/lib/octave- at VERSION@
- at PACKAGE@: binary-or-shlib-defines-rpath ./usr/lib/octave- at VERSION@/liboctave.so. at VERSION@ /usr/lib/octave- at VERSION@
-[V_3_0:@PACKAGE@: extra-license-file usr/share/octave/@VERSION@/m/miscellaneous/license.m:]

Copied: octave/trunk/debian/in/PACKAGE.lintian-overrides (from rev 2177, octave/trunk/debian/in/PACKAGE.lintian)
===================================================================
--- octave/trunk/debian/in/PACKAGE.lintian-overrides	                        (rev 0)
+++ octave/trunk/debian/in/PACKAGE.lintian-overrides	2008-06-23 18:26:51 UTC (rev 2178)
@@ -0,0 +1,3 @@
+ at PACKAGE@: binary-or-shlib-defines-rpath ./usr/bin/octave- at VERSION@ /usr/lib/octave- at VERSION@
+ at PACKAGE@: binary-or-shlib-defines-rpath ./usr/lib/octave- at VERSION@/liboctave.so. at VERSION@ /usr/lib/octave- at VERSION@
+[V_3_0:@PACKAGE@: extra-license-file usr/share/octave/@VERSION@/m/miscellaneous/license.m:]

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-06-23 11:41:32 UTC (rev 2177)
+++ octave/trunk/debian/in/control	2008-06-23 18:26:51 UTC (rev 2178)
@@ -7,7 +7,7 @@
  Thomas Weber <thomas.weber.mail at gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: g++-4.1 [arm], gcc-4.1 [arm], gfortran,
- debhelper (>= 6.0.0), autoconf, texinfo,
+ debhelper (>= 6.0.7), autoconf, texinfo,
  texlive-latex-base, texlive-generic-recommended, libreadline5-dev,
  libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.6) |
  libhdf5-lam-dev (>= 1.6.6) | libhdf5-mpich-dev (>= 1.6.6),

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-06-23 11:41:32 UTC (rev 2177)
+++ octave/trunk/debian/rules	2008-06-23 18:26:51 UTC (rev 2178)
@@ -363,8 +363,7 @@
 	install -p -m 0644  debian/$(PACKAGE).conf  $(debtmp)/etc
 
         # install lintian overrride
-	install -p -m 0644  debian/$(PACKAGE).lintian \
-			$(debtmp)/usr/share/lintian/overrides/$(PACKAGE)
+	dh_lintian -p$(PACKAGE)
 
         ## link the conf.file back from /etc over the version.spec. rc
 	ln -sf /etc/$(PACKAGE).conf 		$(debininew)/octaverc