[Pkg-octave-commit] [SCM] octave-nan branch, master, updated. 42a9efcadefcb1b4ffa1e3766fcd2d7414e2d665

Rafael Laboissiere rafael at debian.org
Wed Jun 10 05:07:27 UTC 2009


The following commit has been merged in the master branch:
commit 42a9efcadefcb1b4ffa1e3766fcd2d7414e2d665
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Jun 7 21:34:20 2009 +0200

    Build-depend on octave-pkg-dev >= 0.7.0

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f8067ac..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream sources.
-See `/usr/share/doc/quilt/README.source' to get more information on how to
-use it.
-
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:50:41 +0200
diff --git a/debian/changelog b/debian/changelog
index 4c6e18f..a10ed7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+octave-nan (1.0.8-2) UNRELEASED; urgency=low
+
+  * debian/patches/autoload-yes.diff: Drop this patch.  This package
+    should not be autoloaded since it overrides the standard functions
+    provided in octave3.0.
+  * debian/control, debian/rules: Adjust to not use quilt anymore
+  * debian/README.source: Removed file
+  * debian/NEWS: Add a note explaining the change above
+  * debian/control: Build-depend on octave-pkg-dev >= 0.7.0, such that the
+    package is built against octave3.2
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 24 May 2009 19:20:04 +0200
+
 octave-nan (1.0.8-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index a1b8b11..9d65112 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.6.4), quilt
+Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.7.0)
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/nan/
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-nan.git
diff --git a/debian/patches/autoload-yes.diff b/debian/patches/autoload-yes.diff
deleted file mode 100644
index 48e2f9a..0000000
--- a/debian/patches/autoload-yes.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Autoload this package
-
- -- Rafael Laboissiere <rafael at debian.org>  Fri, 16 May 2008 14:09:37 +0000
-
-Index: trunk/DESCRIPTION
-===================================================================
---- trunk.orig/DESCRIPTION	2008-05-16 14:05:24.000000000 +0000
-+++ trunk/DESCRIPTION	2008-05-16 14:05:32.000000000 +0000
-@@ -6,5 +6,6 @@
- Title: NaN statisical toolbox
- Description: Missing value statistical toolbox
- Depends: octave (>= 2.9.7)
-+Autoload: yes
- License: GPL version 2 or later
- Url: http://www.dpmi.tu-graz.ac.at/~schloegl/matlab/NaN
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6f889c5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-autoload-yes.diff
diff --git a/debian/rules b/debian/rules
index c066949..fe7bdcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 install/octave-nan::
 	rm -f debian/octave-nan/usr/share/doc/octave-nan/INSTALL

-- 
octave-nan



More information about the Pkg-octave-commit mailing list