[Pkg-octave-commit] rev 45 - in trunk/packages/inline-octave/debian: . patches
Rafael Laboissiere
rafael@costa.debian.org
Fri, 11 Feb 2005 23:32:11 +0100
Author: rafael
Date: 2005-02-11 23:32:11 +0100 (Fri, 11 Feb 2005)
New Revision: 45
Added:
trunk/packages/inline-octave/debian/patches/
trunk/packages/inline-octave/debian/patches/00list
trunk/packages/inline-octave/debian/patches/50_control-output-of-whos.dpatch
Modified:
trunk/packages/inline-octave/debian/changelog
trunk/packages/inline-octave/debian/control
trunk/packages/inline-octave/debian/rules
trunk/packages/inline-octave/debian/watch
Log:
Debian release inline_octave_0.21-2
Modified: trunk/packages/inline-octave/debian/changelog
===================================================================
--- trunk/packages/inline-octave/debian/changelog 2005-02-11 21:04:48 UTC (rev 44)
+++ trunk/packages/inline-octave/debian/changelog 2005-02-11 22:32:11 UTC (rev 45)
@@ -1,3 +1,24 @@
+inline-octave (0.21-2) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * debian/changelog: Added local variables for Emacs debian-changelog-mode
+ * debian/control:
+ - Set maintainer to Debian Octave Group @ alioth.debian.org
+ - Build-Depends on dpatch
+ * debian/watch:
+ - Ported to version 2 of uscan
+ - Changed pattern to fit both *.tar.gz and *.zip at CPAN
+ * debian/rules:
+ - Adjust for using dpatch
+ - Avoid compression of *.t files by dh_compress, such that
+ 8_operators.t, whose size is just above the 4k limit, does not get
+ compressed (perl does not understand gzip files as scripts)
+ * debian/patches/50_control-output-of-whos.dpatch: Force output format
+ of whos command
+
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org> Fri, 11 Feb 2005 23:09:11 +0100
+
inline-octave (0.21-1) unstable; urgency=low
* New upstream release
@@ -34,7 +55,7 @@
inline-octave (0.16-2) unstable; urgency=low
* debian/control: Added octave2.1,libinline-perl to Depends (Closes: #149085)
- * debian/control: Architecture: all, not any
+ * debian/control: Architecture: all, not any
-- Dirk Eddelbuettel <edd@debian.org> Thu, 6 Jun 2002 23:01:34 -0500
@@ -47,7 +68,10 @@
inline-octave (0.10.cvs20011117-1) unstable; urgency=low
* Initial Debian release. (Closes: #119912)
-
+
-- Dirk Eddelbuettel <edd@debian.org> Sat, 17 Nov 2001 23:52:24 -0600
-
+Local Variables:
+debian-changelog-full-name: "Debian Octave Group"
+debian-changelog-mailing-address: "pkg-octave-devel@lists.alioth.debian.org"
+End:
Modified: trunk/packages/inline-octave/debian/control
===================================================================
--- trunk/packages/inline-octave/debian/control 2005-02-11 21:04:48 UTC (rev 44)
+++ trunk/packages/inline-octave/debian/control 2005-02-11 22:32:11 UTC (rev 45)
@@ -1,14 +1,14 @@
Source: inline-octave
Section: perl
Priority: optional
-Maintainer: Dirk Eddelbuettel <edd@debian.org>
+Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
Standards-Version: 3.6.1.0
-Build-Depends-Indep: debhelper (>= 3.0.5), libinline-perl, octave2.1
+Build-Depends-Indep: debhelper (>= 3.0.5), libinline-perl, octave2.1, dpatch
Package: libinline-octave-perl
Architecture: all
Depends: ${perl:Depends}, libinline-perl, octave2.1
Description: Perl5 module to Inline GNU Octave code
- The Inline::Octave Perl5 modules gives you the power of the GNU Octave
- programming language from within your Perl programs.
+ The Inline::Octave Perl5 modules gives you the power of the GNU Octave
+ programming language from within your Perl programs.
Added: trunk/packages/inline-octave/debian/patches/00list
===================================================================
--- trunk/packages/inline-octave/debian/patches/00list 2005-02-11 21:04:48 UTC (rev 44)
+++ trunk/packages/inline-octave/debian/patches/00list 2005-02-11 22:32:11 UTC (rev 45)
@@ -0,0 +1 @@
+50_control-output-of-whos
Added: trunk/packages/inline-octave/debian/patches/50_control-output-of-whos.dpatch
===================================================================
--- trunk/packages/inline-octave/debian/patches/50_control-output-of-whos.dpatch 2005-02-11 21:04:48 UTC (rev 44)
+++ trunk/packages/inline-octave/debian/patches/50_control-output-of-whos.dpatch 2005-02-11 22:32:11 UTC (rev 45)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_control-output-of-whos.dpatch by <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Force output format of whos command
+
+@DPATCH@
+
+--- inline-octave-0.21.orig/Octave.pm
++++ inline-octave-0.21/Octave.pm
+@@ -129,7 +129,7 @@
+ my $switches= "-qfH";
+ my $octave_interpreter_bin;
+
+- $octave_interpreter_bin= 'octave' # _EDITLINE_MARKER_
++ $octave_interpreter_bin= 'octave2.1' # _EDITLINE_MARKER_
+ unless $octave_object->{INTERP};
+
+ $octave_interpreter_bin = $ENV{PERL_INLINE_OCTAVE_BIN}
+@@ -430,11 +430,12 @@
+ sub get_defined_functions
+ {
+ my $o = shift;
++ $o->interpret('whos_line_format ="%ln:50;%rt:50;\n";');
+ my $data= $o->interpret("whos('-functions')");
+ my @funclist;
+- while ( $data =~ /user(-defined|) function +- +- +(\w+)/g )
++ while ( $data =~ /(\w+)\s+user(-defined|) function/g )
+ {
+- push @funclist, $2;
++ push @funclist, $1;
+ }
+ return @funclist;
+
Property changes on: trunk/packages/inline-octave/debian/patches/50_control-output-of-whos.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/inline-octave/debian/rules
===================================================================
--- trunk/packages/inline-octave/debian/rules 2005-02-11 21:04:48 UTC (rev 44)
+++ trunk/packages/inline-octave/debian/rules 2005-02-11 22:32:11 UTC (rev 45)
@@ -3,7 +3,9 @@
# debian/rules file for the Debian Linux libinline-octave-perl package
# Copyright (C) 2001 - 2002 by Dirk Eddelbuettel <edd@debian.org>
-package := $(shell grep Package debian/control | sed 's/^Package: //')
+include /usr/share/dpatch/dpatch.make
+
+PACKAGE := $(shell grep Package debian/control | sed 's/^Package: //')
version := $(shell head -1 debian/changelog | \
perl -nle 'm/\S+\s+\((\S+)\)/ && print $$1')
debtmp := $(CURDIR)/debian/tmp
@@ -13,7 +15,7 @@
lynx http://www.cpan.org/authors/id/A/AA/AADLER
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
# massage Makefile.PL to navigate around interactive question
@@ -26,7 +28,7 @@
# $(MAKE) test
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp test-stamp
@@ -46,14 +48,14 @@
dh_perl
dh_installdocs
dh_installexamples t/*.t
- chmod 644 $(CURDIR)/debian/tmp/usr/share/doc/$(package)/examples/*t
+ chmod 644 $(CURDIR)/debian/tmp/usr/share/doc/$(PACKAGE)/examples/*t
# dh_installmenu
# dh_installinit
# dh_installcron
# dh_installmanpages
# dh_undocumented
dh_installchangelogs
- dh_compress
+ dh_compress --exclude=.t
dh_fixperms
# dh_suidregister
dh_installdeb
Modified: trunk/packages/inline-octave/debian/watch
===================================================================
--- trunk/packages/inline-octave/debian/watch 2005-02-11 21:04:48 UTC (rev 44)
+++ trunk/packages/inline-octave/debian/watch 2005-02-11 22:32:11 UTC (rev 45)
@@ -1,2 +1,4 @@
# uscan(1) control file watch control file for Inline-Octave
-http://www.cpan.org /authors/id/A/AA/AADLER/ Inline-Octave-([-0-9\.]*).tar.gz debian
+version=2
+http://www.cpan.org/authors/id/A/AA/AADLER Inline-Octave-([-0-9\.]*)\..*
+