[Pkg-octave-commit] rev 122 - trunk/packages/octave2.1/debian
Rafael Laboissiere
pkg-octave-devel@lists.alioth.debian.org
Fri, 25 Feb 2005 12:27:26 +0100
Author: rafael
Date: 2005-02-25 12:27:26 +0100 (Fri, 25 Feb 2005)
New Revision: 122
Modified:
trunk/packages/octave2.1/debian/
trunk/packages/octave2.1/debian/changelog
trunk/packages/octave2.1/debian/control
trunk/packages/octave2.1/debian/rules
Log:
* .: Added patched/ to svn:ignore
Property changes on: trunk/packages/octave2.1/debian
___________________________________________________________________
Name: svn:ignore
- tmp
octave
octave2.1-doc
octave2.1-emacsen
octave2.1-htmldoc
octave2.1-info
octave2.1-headers
files
substvars
octave2.1.postinst
octave2.1-headers.postinst
octave2.1-emacsen.postinst
octave2.1.prerm
octave2.1-headers.prerm
octave2.1-emacsen.prerm
octave2.1.lintian
*.debhelper
+ tmp
octave
octave2.1-doc
octave2.1-emacsen
octave2.1-htmldoc
octave2.1-info
octave2.1-headers
files
substvars
octave2.1.postinst
octave2.1-headers.postinst
octave2.1-emacsen.postinst
octave2.1.prerm
octave2.1-headers.prerm
octave2.1-emacsen.prerm
octave2.1.lintian
*.debhelper
patched
Modified: trunk/packages/octave2.1/debian/changelog
===================================================================
--- trunk/packages/octave2.1/debian/changelog 2005-02-24 21:56:47 UTC (rev 121)
+++ trunk/packages/octave2.1/debian/changelog 2005-02-25 11:27:26 UTC (rev 122)
@@ -1,14 +1,20 @@
-octave2.1 (2.1.65-2) unstable; urgency=low
+octave2.1 (2.1.66-1) unstable; urgency=low
- NOT YET RELEASED!
-
+++ Changes by Rafael Laboissiere
- * debian/rules: Use compiler flag "-O0" instead of "-O1" for the m68k
- architecture. Let us hope that this will fix the buildd problem on
- the m68k architecture.
+ * New upstream release
+ * debian/control: Build-depend on dpatch
+ * debian/rules:
+ - Adjust for using dpatch
+ - Use compiler flag "-O0" instead of "-O1" for the m68k architecture.
+ Let us hope that this will fix the buildd problem on the m68k
+ architecture.
+ - Removed hack to build the PDF documentation files, since they are
+ now built by the upstream Makefile
+ * debian/patches/50_build-faq-pdf.dpatch: Added patch for building
+ Octave-FAQ.pdf
- --
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org> Fri, 25 Feb 2005 11:17:08 +0100
octave2.1 (2.1.65-1) unstable; urgency=low
Modified: trunk/packages/octave2.1/debian/control
===================================================================
--- trunk/packages/octave2.1/debian/control 2005-02-24 21:56:47 UTC (rev 121)
+++ trunk/packages/octave2.1/debian/control 2005-02-25 11:27:26 UTC (rev 122)
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 3.0.0), autoconf, texinfo, tetex-bin, g77 [!m68k], fort77 [m68k], libreadline5-dev, libncurses5-dev, gperf, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, libhdf5-serial-dev
+Build-Depends: debhelper (>= 3.0.0), autoconf, texinfo, tetex-bin, g77 [!m68k], fort77 [m68k], libreadline5-dev, libncurses5-dev, gperf, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, libhdf5-serial-dev, dpatch
Standards-Version: 3.6.1.1
Package: octave2.1
Modified: trunk/packages/octave2.1/debian/rules
===================================================================
--- trunk/packages/octave2.1/debian/rules 2005-02-24 21:56:47 UTC (rev 121)
+++ trunk/packages/octave2.1/debian/rules 2005-02-25 11:27:26 UTC (rev 122)
@@ -5,33 +5,32 @@
#
# $Id: rules,v 1.7 2004/03/04 18:52:52 edd Exp edd $
+
+include /usr/share/dpatch/dpatch.make
+
# in order: octave, octave2.1, 2.1.28, 2.1 (or whatever the version is)
source := $(shell head -1 debian/changelog | \
perl -nle 'm/^([a-z]+)/ and print $$1')
-package := $(shell head -1 debian/changelog | \
+PACKAGE := $(shell head -1 debian/changelog | \
perl -nle 'm/^(\S+)\s+/ and print $$1')
version := $(shell head -1 debian/changelog | \
perl -nle 'm/\S+\s+\((\S+)-\S+\)/ and print $$1')
major := $(shell head -1 debian/changelog | perl -nle \
'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
-doc_package = $(package)-doc
-html_package = $(package)-htmldoc
-dev_package = $(package)-headers
-emacs_package = $(package)-emacsen
-info_package = $(package)-info
+doc_package = $(PACKAGE)-doc
+html_package = $(PACKAGE)-htmldoc
+dev_package = $(PACKAGE)-headers
+emacs_package = $(PACKAGE)-emacsen
+info_package = $(PACKAGE)-info
debbase := $(CURDIR)/debian
debtmp := $(debbase)/tmp
-debdoc := $(debtmp)/usr/share/doc/$(package)
+debdoc := $(debtmp)/usr/share/doc/$(PACKAGE)
deblsp := $(debbase)/$(emacs_package)/usr/share/emacs/site-lisp/$(emacs_package)
debini := $(debtmp)/usr/share/octave/site/m/startup
debininew := $(debtmp)/usr/share/octave/$(version)/m/startup
-pdfdocs := doc/faq/Octave-FAQ.pdf \
- doc/interpreter/octave.pdf \
- doc/liboctave/liboctave.pdf
-
## edd 3 Feb 2003 gcc 3.2, also imposed uniformly via Build-Depends
## edd 27 Jun 2003 now that gcc 3.3 is in unstable and testing, relax this
#c_compiler = /usr/bin/gcc-3.2
@@ -83,17 +82,9 @@
build: build-stamp configure-stamp make-stamp check-stamp
build-stamp: configure make check
- # make all PDF documentation files
- @for i in $(pdfdocs) ; do \
- d=`dirname $$i` ; \
- f=`basename $$i .pdf` ; \
- ( cd $$d ; \
- TEXINPUTS=".:./..::" texi2pdf $$f.texi ; \
- echo "Generated $$d/$$f.pdf" ) ; \
- done
touch build-stamp
-configure: configure-stamp
+configure: patch-stamp configure-stamp
configure-stamp:
dh_testdir
@@ -158,7 +149,7 @@
-$(MAKE) check
touch check-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
@@ -174,7 +165,7 @@
rm -f debian/$${i}.$${j} ; \
done ; \
done
- rm -f debian/octave2.1.lintian octave-depends.1 $(pdfdocs)
+ rm -f debian/octave2.1.lintian octave-depends.1
dh_clean
# install files
@@ -245,7 +236,7 @@
dh_testdir -a
dh_testroot -a
# dh_clean -a -k
- dh_installdirs -p$(package)
+ dh_installdirs -p$(PACKAGE)
# remove the /usr/share/info/dir stab
rm -vf $(debtmp)/usr/share/info/dir
# save the static libs for seperate package octave-staticlibs
@@ -261,30 +252,30 @@
# save the info files for the info package
dh_movefiles -p$(info_package) usr/share/info/
# install /etc/octave.conf
- install -p -m 0644 debian/octave.conf $(debtmp)/etc/$(package).conf
+ install -p -m 0644 debian/octave.conf $(debtmp)/etc/$(PACKAGE).conf
# install lintian overrride
install -p -m 0644 debian/octave2.1.lintian \
- $(debtmp)/usr/share/lintian/overrides/$(package)
+ $(debtmp)/usr/share/lintian/overrides/$(PACKAGE)
## link the conf.file back from /etc over the version.spec. rc
- ln -sf /etc/$(package).conf $(debininew)/octaverc
+ ln -sf /etc/$(PACKAGE).conf $(debininew)/octaverc
## this file would exist under 2.0 and 2.1 with the same name
rm -v $(debini)/octaverc
# already installed by make
dh_installinfo -n -p$(info_package) doc/*/*.info*
dh_installdocs -a README README.kpathsea \
NEWS* PROJECTS
- dh_installdocs -p$(package) debian/README.Atlas
+ dh_installdocs -p$(PACKAGE) debian/README.Atlas
# recreated in postinst in share/, not needed in lib
rm -vf $(debtmp)/usr/lib/octave/ls-R \
$(debtmp)/usr/share/octave/ls-R
# dh_installexamples -a
dh_installexamples -p$(dev_package) examples/*
# dh_installmenu -a
- dh_installmenu -p$(package)
+ dh_installmenu -p$(PACKAGE)
# dh_installinit -a
# dh_installcron -a
# dh_installmanpages -a
-# dh_undocumented -p$(package) octave-config-$(version).1
+# dh_undocumented -p$(PACKAGE) octave-config-$(version).1
dh_installchangelogs -a ChangeLog ChangeLog.1
for i in glob libcruft liboctave src scripts test doc; do \
cp -vax $$i/ChangeLog $(debdoc)/changelog.$$i; done