[Pkg-octave-commit] rev 538 - in trunk/packages/octave/debian: . in
patches
Rafael Laboissiere
rafael at costa.debian.org
Tue Mar 28 20:34:34 UTC 2006
Author: rafael
Date: 2006-03-28 20:34:32 +0000 (Tue, 28 Mar 2006)
New Revision: 538
Removed:
trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch
trunk/packages/octave/debian/patches/50_install-liboctinterp.dpatch
trunk/packages/octave/debian/patches/50_octave-mod-bind-m-bs-2.9.dpatch
trunk/packages/octave/debian/patches/70_octave-mod-honor-auto-indent.dpatch
Modified:
trunk/packages/octave/debian/changelog
trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq
trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual
trunk/packages/octave/debian/in/octave2.9-00list
trunk/packages/octave/debian/rules
Log:
* Preparation for release 2.9.5-1
* Since upstream is distributing now the html documentation in separated HTML
directories under doc/* with multiple index.html files, the html files
are now installed into separated directories under /usr/share/doc/.
* The *.doc-base.* files are now processed through slice to cope with
the differnces between 2.1 and 2.9
* In order to avoid problems in generating the .diff.gz file, the
whole doc/ directory is saved in doc-orig and restored at
./debian/rules clean
* Removed obsolete dpatches
Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog 2006-03-26 22:05:58 UTC (rev 537)
+++ trunk/packages/octave/debian/changelog 2006-03-28 20:34:32 UTC (rev 538)
@@ -1,3 +1,21 @@
+octave2.9 (2.9.5-1) unstable; urgency=low
+
+ NOT YET RELEASED!
+
+ [ Rafael Laboissiere ]
+ * New upstream release
+ * Redesigned the build & install processes for the html documentation,
+ since it is now shipped in HTML directories under doc/.
+ * debian/in/octave2.9-00list: Removed from the list the following
+ patches:
+ - 50_install-liboctinterp
+ - 50_glpk-sparse
+ - 50_octave-mod-bind-m-bs-2.9
+ - 70_octave-mod-honor-auto-indent
+ which have been applied upstream.
+
+ --
+
octave2.1 (1:2.1.73-1) unstable; urgency=low
[ Thomas Weber ]
@@ -1860,7 +1878,7 @@
(save-excursion
(forward-line -1)
(beginning-of-line)
- (insert "\n NOT YET RELEASED!\n\n [ "
+ (insert "\n NOT YET RELEASED!\n\n [ "
(or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
nil t)
End:
Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq 2006-03-26 22:05:58 UTC (rev 537)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq 2006-03-28 20:34:32 UTC (rev 538)
@@ -10,5 +10,5 @@
Section: Apps/Math
Format: HTML
-Index: /usr/share/doc/@PACKAGE at -htmldoc/Octave-FAQ_toc.html
-Files: /usr/share/doc/@PACKAGE at -htmldoc/Octave-FAQ*.html
+Index: /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:Octave-FAQ_toc:][V_2_9:faq/index:].html
+Files: /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:Octave-FAQ:][V_2_9:faq/:]*.html
Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib 2006-03-26 22:05:58 UTC (rev 537)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib 2006-03-28 20:34:32 UTC (rev 538)
@@ -9,5 +9,5 @@
Section: Apps/Math
Format: HTML
-Index: /usr/share/doc/@PACKAGE at -htmldoc/liboctave_toc.html
-Files: /usr/share/doc/@PACKAGE at -htmldoc/liboctave_*.html
+Index: /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:liboctave_toc:][V_2_9:lib/index:].html
+Files: /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:liboctave_:][V_2_9:lib/:]*.html
Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual 2006-03-26 22:05:58 UTC (rev 537)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual 2006-03-28 20:34:32 UTC (rev 538)
@@ -8,5 +8,5 @@
Section: Apps/Math
Format: HTML
-Index: /usr/share/doc/@PACKAGE at -htmldoc/octave_toc.html
-Files: /usr/share/doc/@PACKAGE at -htmldoc/octave_*.html
+Index: /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:octave_toc:][V_2_9:interpreter/index:].html
+Files: /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:octave_:][V_2_9:interpreter/:]*.html
Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list 2006-03-26 22:05:58 UTC (rev 537)
+++ trunk/packages/octave/debian/in/octave2.9-00list 2006-03-28 20:34:32 UTC (rev 538)
@@ -1,6 +1,2 @@
50_mkoctfile.1-no-negative
-50_install-liboctinterp
50_octave-value-list-resize-2.9
-50_glpk-sparse
-50_octave-mod-bind-m-bs-2.9
-70_octave-mod-honor-auto-indent
Deleted: trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch
Deleted: trunk/packages/octave/debian/patches/50_install-liboctinterp.dpatch
Deleted: trunk/packages/octave/debian/patches/50_octave-mod-bind-m-bs-2.9.dpatch
Deleted: trunk/packages/octave/debian/patches/70_octave-mod-honor-auto-indent.dpatch
Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules 2006-03-26 22:05:58 UTC (rev 537)
+++ trunk/packages/octave/debian/rules 2006-03-28 20:34:32 UTC (rev 538)
@@ -75,8 +75,10 @@
#export DH_VERBOSE=1
#export DH_COMPAT=3
+sliceterm = UNDEF+V_$(shell echo $(major) | sed s/\\./_/g)
+
debian/control: debian/in/control
- slice -o UNDEF+V_`echo $(major) | sed s/\\\\./_/g`:$@ $<
+ slice -o $(sliceterm):$@ $<
maintainer-clean:
rm -f debian/control
@@ -87,6 +89,11 @@
sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;' \
< $$in > $$out ; \
done
+ for doc in faq manual lib ; do\
+ slice -o $(sliceterm):$(debtmp)-htmldoc.doc-base.$$doc \
+ $(debtmp)-htmldoc.doc-base.$$doc ; \
+ done
+
for f in octave-depends defs.make ; do \
sed 's/@VERSION@/$(version)/g;s/@MAJOR@/$(major)/g' \
< debian/in/$$f > debian/$$f ; \
@@ -138,25 +145,26 @@
pod2man debian/octave-depends > octave-depends-$(version).1
+ if test ! -d doc-orig ; then cp -a doc doc-orig ; fi
for f in $(texifiles) ; do \
cp $$f $$f-save ; \
perl -pi -e 's/^(\@setfilename .+ctave)/$${1}$(major)/' \
$$f ; \
done
- # The following will prevent the build of pre-formatted docs
- touch doc/*/*.{dvi,ps,pdf,html}
touch configure-stamp
make: configure-stamp make-stamp
make-stamp:
+
$(MAKE) CFLAGS="$(compilerflags)" \
CXXFLAGS="$(compilerflags)" \
FFLAGS="$(compilerflags)" \
LDFLAGS="$(linkerflags)" \
CC="$(c_compiler)" \
CXX="$(cxx_compiler)" \
- F77="$(f77_compiler)"
+ F77="$(f77_compiler)" \
+
touch make-stamp
check: configure-stamp make-stamp check-stamp
@@ -167,9 +175,12 @@
clean: unpatch
dh_testdir
dh_testroot
+
+ if test ! -d doc-orig ; then cp -a doc doc-orig ; fi
+
-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
rm -f build-stamp configure-stamp make-stamp check-stamp \
- install-stamp
+ install-stamp Makefile.tmp
-rm -vrf libcruft/libcruft.so libcruft/*/Makefile \
install.octave scripts/gethelp libcruft/misc/*.d \
scripts/autom4te.cache config.log Makefrag.f77 \
@@ -183,10 +194,8 @@
rm -f octave-depends-$(version).1
( cd debian ; rm -f watch octave-depends defs.make )
- for f in $(texifiles) ; do \
- test ! -f $$f-save || mv $$f-save $$f ; \
- done
- rm -f doc/*/*ctave$(major)*.info*
+ rm -rf doc
+ mv doc-orig doc
dh_clean
@@ -219,7 +228,13 @@
# dh_clean -i -k
#$(MAKE) prefix=`pwd`/debian/tmp install
dh_installdocs -n -p$(doc_package) doc/*/*.pdf
- dh_installdocs -n -p$(html_package) doc/*/*.html
+ for dir in faq interpreter liboctave ; do\
+ dh_installdocs -n -p$(html_package)\
+ `find doc/$$dir -name \*.html` ;\
+ mkdir $(debdoc)-htmldoc/$$dir;\
+ mv $(debdoc)-htmldoc/*.html $(debdoc)-htmldoc/$$dir;\
+ done
+
dh_installdocs -i
# install Octave Emacs files and Debian Emacsen files
dh_installdirs -p$(emacs_package)
@@ -306,7 +321,7 @@
dh_link --package=$(PACKAGE) \
usr/bin/octave-$(version) usr/bin/$(PACKAGE)
dh_link --package=$(PACKAGE) \
- /usr/share/man/man1/octave-$(version).1.gz /usr/share/man/man1/octave$(major).1.gz
+ /usr/share/man/man1/octave-$(version).1.gz /usr/share/man/man1/octave$(major).1.gz
dh_strip -a
dh_compress -a
dh_fixperms -a
More information about the Pkg-octave-commit
mailing list