summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Laboissière <rafael@debian.org>2022-07-12 11:29:13 -0300
committerRafael Laboissière <rafael@debian.org>2022-07-12 11:55:20 -0300
commitb825d049a93137c7fe39f308a5ce2b40fb8fef23 (patch)
tree17485f3f23ff24bba59ee5d61f1dfba88b37f2cb
parentd1338d6d5df04a6d84d00adfb812eeb466096d07 (diff)
Proper cleaning of files generated by the configure script
+ d/clean, d/s/options: Drop obsolete files + d/p/add-distclean-rule.patch: New patch + d/control: Build-depend on dh-octave >= 1.2.3 Gbp-Dch: Full
-rw-r--r--debian/clean5
-rw-r--r--debian/control1
-rw-r--r--debian/patches/add-distclean-target.patch22
-rw-r--r--debian/patches/series1
-rw-r--r--debian/source/options1
5 files changed, 24 insertions, 6 deletions
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index d83f69c..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,5 +0,0 @@
-src/confdefs.h
-src/Makefile
-src/config.h
-src/config.log
-src/config.status
diff --git a/debian/control b/debian/control
index 929853e..a6f32b7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian Octave Group <team+pkg-octave-team@tracker.debian.org>
Uploaders: Rafael Laboissière <rafael@debian.org>
Build-Depends: debhelper-compat (= 13),
+ dh-octave (>= 1.2.3),
dh-sequence-octave,
libgdal-dev,
octave-io (>= 2.6.1-2),
diff --git a/debian/patches/add-distclean-target.patch b/debian/patches/add-distclean-target.patch
new file mode 100644
index 0000000..066cc9c
--- /dev/null
+++ b/debian/patches/add-distclean-target.patch
@@ -0,0 +1,22 @@
+Description: Add distclean rule to src/Makefile.in
+ Besides the addition of the distclean target, the clean rule has been
+ modified by adding the "-" prefix to the rm command, such that make
+ will not stop if the files to be cleaned do not exist. Also, a .PHONY
+ target has been added.
+Author: Rafael Laboissière <rafael@debian.org>
+Forwarded: https://savannah.gnu.org/bugs/index.php?62753
+Last-Update: 2022-07-11
+
+--- octave-mapping-1.4.2.orig/src/Makefile.in
++++ octave-mapping-1.4.2/src/Makefile.in
+@@ -9,4 +9,9 @@ gdalread.oct : gdalread.cc misc.cpp
+ $(MKOCTFILE) $(DEFS) $(CXXFLAGS) $(GDAL_CFLAGS) $(GDAL_LIBS) -o $@ $^
+
+ clean:
+- rm misc.o gdalread.o gdalread.oct
++ -rm misc.o gdalread.o gdalread.oct
++
++distclean: clean
++ -rm Makefile config.h config.log config.status
++
++.PHONY: clean distclean
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/source/options b/debian/source/options
deleted file mode 100644
index e3eb417..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-extend-diff-ignore=inst/deg2rad.m|inst/rad2deg.m|src/deg2rad.m|src/rad2deg.m|src/Makefile|src/config.h|src/config.log|src/config.status