diff options
| author | Rafael Laboissière <rafael@debian.org> | 2023-08-30 05:56:55 -0300 |
|---|---|---|
| committer | Rafael Laboissière <rafael@debian.org> | 2023-08-30 05:56:55 -0300 |
| commit | 603d36a8331c5f0677e5114c3b6fbbc9b874be41 (patch) | |
| tree | 93aa5486e350fa942b625eb09945238a0b8807ac | |
| parent | 566f6d5e9fc1780fc6efb75849fce2446d6baf3a (diff) | |
Revert commits 8abffc0 and 566f6d5
We have already a mechanism for copying with the non-existent
executable /usr/bin/mkoctfile when running the Octave command
mkoctfile (through d/debian_missing_handler.m). The changes in commit
8abffc0 are then unnecessary. Commit 566f6d5 is also reverted (changed
in d/changelog). It was a mistake on my part.
Gbp-Dch: Ignore
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | debian/octave-common.install | 10 | ||||
| -rw-r--r-- | debian/octave-dev.install | 1 |
3 files changed, 3 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 65503b9ae..bf9dd435f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -octave (8.3.0-2) unstable; urgency=medium - - * d/p/mkoctfile-skip-options.patch: New patch. - Thanks to Markus Mützel <markus.muetzel@gmx.de> (Closes: #1050082) - * Move file mkoctifile.m from octave-common to octave-dev - - -- Rafael Laboissière <rafael@debian.org> Wed, 30 Aug 2023 03:21:16 -0300 - octave (8.3.0-1) unstable; urgency=medium * New upstream version 8.3.0 diff --git a/debian/octave-common.install b/debian/octave-common.install index 2b658bd84..6f48d5ad9 100755..100644 --- a/debian/octave-common.install +++ b/debian/octave-common.install @@ -1,11 +1,7 @@ -#!/bin/sh - -(cd debian/tmp ; find usr/share/octave -type f | grep -v mkoctfile.m) - -cat <<EOF +usr/share/octave usr/share/icons + debian/octaverc /etc -EOF # Install the Debian-specific error handler -echo "debian/debian_missing_handler.m /usr/share/octave/site/m/" +debian/debian_missing_handler.m /usr/share/octave/site/m/ diff --git a/debian/octave-dev.install b/debian/octave-dev.install index 56b6d7464..859d2e560 100644 --- a/debian/octave-dev.install +++ b/debian/octave-dev.install @@ -3,4 +3,3 @@ usr/bin/octave-config usr/include debian/defs.make /usr/share/octave/debian/ usr/lib/*/pkgconfig -/usr/share/octave/*/m/miscellaneous/mkoctfile.m |