[Pkg-octave-commit] [SCM] Debian packaging for octave-pkg-dev branch, master, updated. d688a7e52676d3c6aa614fe9d8a02f45865dc0cd
Rafael Laboissiere
rafael at laboissiere.net
Thu Mar 8 16:17:34 UTC 2012
The following commit has been merged in the master branch:
commit d688a7e52676d3c6aa614fe9d8a02f45865dc0cd
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Tue Mar 6 21:44:53 2012 +0100
Stop doing content substitution in octave-pkg.mk
The substitution of the @OCTAVE@ tag was necessary in the days when we had
octave packages with versioned names. This is not necessary anymore, so
(1) the octave-pkg.mk.in has been renamed to octave-pkg.mk, (2) the full
path for octave has been set in the new variable $(octave), and (3) the
code in debian/rules for doing the substitution via sed has been removed.
Also, update the list of exclusions for Git.
diff --git a/.gitignore b/.gitignore
index 1b4f8b6..e7c0337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,3 @@ debian/files
debian/octave-pkg-dev.debhelper.log
debian/octave-pkg-dev/
debian/octave-pkg-dev.substvars
-octave-pkg-helper
-octave-pkg.mk
diff --git a/debian/changelog b/debian/changelog
index 1ae84ce..656760c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
octave-pkg-dev (0.7.7) UNRELEASED; urgency=low
- * octave-pkg.mk.in (check-pkg): Allow class methods to be properly
- checked
+ * octave-pkg.mk:
+ + Renamed from octave-pkg.mk.in, since we do not change content
+ anymore. The code in debian/rules has been changed accordingly.
+ + (check-pkg): Allow class methods to be properly checked
-- Rafael Laboissiere <rafael at laboissiere.net> Tue, 06 Mar 2012 21:36:29 +0100
diff --git a/debian/rules b/debian/rules
index a8750c5..740d2d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,7 @@
#
# debian/rules for the octave-pkg-dev Debian package
-OCTPKG = octave
-FILES = octave-pkg.mk
-
include /usr/share/cdbs/1/rules/debhelper.mk
-%: %.in
- sed 's/@OCTAVE@/$(OCTPKG)/' < $< > $@
-
-build/octave-pkg-dev:: $(FILES)
+build/octave-pkg-dev::
chmod +x octave-pkg-helper
-
-clean::
- rm -f $(FILES)
diff --git a/octave-pkg.mk.in b/octave-pkg.mk
similarity index 97%
rename from octave-pkg.mk.in
rename to octave-pkg.mk
index 0cc26e3..4de3610 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk
@@ -31,6 +31,7 @@ mpath = usr/share/octave/packages
bpath = usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/octave/packages
hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
apiversion = $(shell octave-config -p API_VERSION)
+octave = /usr/bin/octave
octave_options = --no-history --silent --no-init-file
global_list = global-list
local_list = local-list
@@ -56,7 +57,7 @@ create-dirs:
.PHONY: install-pkgs
install-pkg:
-[ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
- @OCTAVE@ $(octave_options) --eval \
+ $(octave) $(octave_options) --eval \
"pkg ('prefix', [pwd(),'/$(debpkg)/$(mpath)'], \
[pwd(),'/$(debpkg)/$(bpath)']); \
pkg ('local_list', [pwd(),'/$(local_list)']); \
@@ -95,7 +96,7 @@ check-pkg:
| perl -pe 's:[^@]*/(.*)\.m::; \
print "disp (\"[$$1]\")\ntest $$1"' \
>> $$tmp ; \
- @OCTAVE@ $(octave_options) $$tmp ; \
+ $(octave) $(octave_options) $$tmp ; \
rm -f $$tmp
# Extract tests from .cc files - these are not installed, but the
@@ -127,7 +128,7 @@ check-pkg:
rm -f $$tmp
@if [ -f debian/check.m ] ; then \
- @OCTAVE@ $(octave_options) --eval \
+ $(octave) $(octave_options) --eval \
"addpath (genpath ([pwd(),'/debian'])); \
source ('debian/check.m');" ; \
fi
--
Debian packaging for octave-pkg-dev
More information about the Pkg-octave-commit
mailing list