summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog12
-rw-r--r--debian/clean5
-rw-r--r--debian/control3
-rw-r--r--debian/patches/add-distclean-target.patch17
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
-rw-r--r--src/Makefile.in3
7 files changed, 36 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 3a0b716..0c2931c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+octave-nan (3.7.0-2) unstable; urgency=medium
+
+ * Build-depend on dh-sequence-octave
+ + d/control: Ditto
+ + d/rules: Drop the --with=octave option from dh call
+ * Proper cleaning of files generated by the configure script
+ + d/clean: Drop obsolete file
+ + d/p/add-distclean-target.patch: New patch
+ + d/control: Build-depend on dh-octave >= 1.2.3
+
+ -- Rafael Laboissière <rafael@debian.org> Tue, 12 Jul 2022 12:11:11 -0300
+
octave-nan (3.7.0-1) unstable; urgency=medium
* New upstream version 3.7.0
diff --git a/debian/clean b/debian/clean
index 6cf24ab..565ffaa 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,7 +1,2 @@
-iris.data
inst/make.m
-src/config.status
-src/Makefile
-src/config.h
-src/config.log
test/debug.mat
diff --git a/debian/control b/debian/control
index f256dfc..384ddc5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Uploaders: Thomas Weber <tweber@debian.org>,
Section: math
Priority: optional
Build-Depends: debhelper-compat (= 13),
- dh-octave (>= 0.7.1),
+ dh-octave (>= 1.2.3),
+ dh-sequence-octave,
liblinear-dev,
libsvm-dev,
wget
diff --git a/debian/patches/add-distclean-target.patch b/debian/patches/add-distclean-target.patch
new file mode 100644
index 0000000..42fdc15
--- /dev/null
+++ b/debian/patches/add-distclean-target.patch
@@ -0,0 +1,17 @@
+Description: Add distclean target to src/Makefile.in
+Author: Rafael Laboissière <rafael@debian.org>
+Forwarded: https://savannah.gnu.org/bugs/?62754
+Last-Update: 2022-07-11
+
+--- octave-nan-3.7.0.orig/src/Makefile.in
++++ octave-nan-3.7.0/src/Makefile.in
+@@ -120,6 +120,9 @@ all: octave win32 win64 mex4m
+ clean:
+ -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
+
++distclean: clean
++ -$(RM) config.status Makefile config.h config.log
++
+ #$(PROGS): Makefile
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..62e95a2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add-distclean-target.patch
diff --git a/debian/rules b/debian/rules
index 536e6cb..0a40e70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# -*- makefile -*-
%:
- dh $@ --buildsystem=octave --with=octave
+ dh $@ --buildsystem=octave
execute_before_dh_installdeb:
# Fix wrong permission of a file in the upstream tarball
diff --git a/src/Makefile.in b/src/Makefile.in
index 86bf766..181c85f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -120,6 +120,9 @@ all: octave win32 win64 mex4m
clean:
-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
+distclean: clean
+ -$(RM) config.status Makefile config.h config.log
+
#$(PROGS): Makefile