[Pkg-octave-commit] [octave-communications] 01/05: Use the dh-based version of octave-pkg-dev

Rafael Laboissiere rafael at debian.org
Sat Dec 30 14:37:49 UTC 2017


This is an automated email from the git hooks/post-receive script.

rafael pushed a commit to branch master
in repository octave-communications.

commit 23a9e9b3d314d028cb1e2792249dc050ae38b119
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Dec 29 21:57:04 2017 -0200

    Use the dh-based version of octave-pkg-dev
---
 debian/control | 3 +--
 debian/rules   | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index f75b34e..6385844 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Uploaders: Rafael Laboissiere <rafael at debian.org>,
 Section: math
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               cdbs,
-               octave-pkg-dev,
+               octave-pkg-dev (>= 2),
                texlive,
                texlive-generic-recommended,
                ghostscript,
diff --git a/debian/rules b/debian/rules
index f0408a0..7ad9ecb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/octave-pkg-dev/octave-pkg.mk
 
 export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -SDate | date -f- +%s)
 
@@ -12,7 +12,7 @@ indepshr = $(CURDIR)/debian/octave-$(pkg)-common/usr/share
 DEB_DH_INSTALL_SOURCEDIR = debian/octave-$(pkg)
 
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
-build/octave-$(pkg)::
+build/octave-$(pkg):
 	for i in awgn.pdf eyediagram.pdf scatterplot.pdf ; do		\
 	    make -C doc $$i ;						\
 	    sed -i -e 's|/tmp/oct-.......eps|/tmp/oct.eps|' doc/$$i ;	\
@@ -20,9 +20,9 @@ build/octave-$(pkg)::
 	make -C doc comms.pdf comms.info
 endif
 
-install/octave-$(pkg)-common:: install/octave-$(pkg)
+install/octave-$(pkg)-common: install/octave-$(pkg)
 
-install/octave-$(pkg)::
+install/octave-$(pkg):
 	# Move the architecture independent files into the appropriate
 	# package
 	mkdir -p $(indepshr)

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-communications.git



More information about the Pkg-octave-commit mailing list