[Pkg-octave-commit] [SCM] octave-optim branch, master, updated. 1f1bcd1178f2d9858fe71e6deee23594de6052c4

[Thomas Weber]

The following commit has been merged in the master branch:
commit 3fe50f3b86632bb124489e3e4d075c5e14b2ce7f
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Thu Dec 31 00:04:59 2009 +0100

    Use debian/octave-optim.docs for installation of documentation

diff --git a/debian/changelog b/debian/changelog
index d9ee4e1..a6917ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-octave-optim (1.0.5-2) UNRELEASED; urgency=low
+octave-optim (1.0.6-1) UNRELEASED; urgency=low
 
   [ Rafael Laboissiere ]
   * debian/control: Build-depend on octave-pkg-dev >= 0.7.0, such that the
@@ -8,6 +8,7 @@ octave-optim (1.0.5-2) UNRELEASED; urgency=low
   * New upstream release
   * New patch: remove_fzero: Remove fzero.m, it is included in Octave 3.2 and
     uses removed functions (fsolve_options)
+  * Use debian/octave-optim.docs for installation of documentation
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 07 Jun 2009 21:06:50 +0200
 
diff --git a/debian/octave-optim.docs b/debian/octave-optim.docs
new file mode 100644
index 0000000..3ff3791
--- /dev/null
+++ b/debian/octave-optim.docs
@@ -0,0 +1 @@
+doc/optim-mini-howto-2.pdf
diff --git a/debian/rules b/debian/rules
index 7dd166e..35cd36f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,11 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
-pkg = octave-optim
-wrongdocs = Makefile optim-mini-howto-2.lyx optim-mini-howto-2.tex
+#pkg = octave-optim
+#wrongdocs = Makefile optim-mini-howto-2.lyx optim-mini-howto-2.tex
 
-install/$(pkg)::
-	( cd debian/$(pkg)/usr/share/doc/$(pkg) ;			\
-	  for f in $(wrondocs) ; do [ -f $$f ] && rm $$f ; done ;	\
-	  [ -d figures ] && rm -rf figures )
+#install/$(pkg)::
+#	( cd debian/$(pkg)/usr/share/doc/$(pkg) ;			\
+#	  ls -al )
+#	  for f in $(wrondocs) ; do [ -f $$f ] && rm $$f ; done ;	\
+#	  [ -d figures ] && rm -rf figures )

-- 
octave-optim