[Pkg-octave-commit] r1017 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2007-09-24 20:40:36 +0000 (Mon, 24 Sep 2007)
New Revision: 1017

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
   octave/trunk/debian/rules
Log:
Debian release octave2.9_1:2.9.14-1

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-09-23 21:10:42 UTC (rev 1016)
+++ octave/trunk/debian/changelog	2007-09-24 20:40:36 UTC (rev 1017)
@@ -19,11 +19,14 @@
     to 90 and keep that of octave2.1 at 80
   * debian/in/control:
     + octave*-emacsen package depends on newer emacs22
+    + Build-depends on desktop-file-utils
     + Added Homepage field
   * debian/in/PACKAGE-htmldoc.doc-base.faq: Reference the correct HTML
     files of the FAQ
-  * debian/rules: Patch the examples/octave.desktop.in file, such that the
-    referenced command exists
+  * debian/rules:
+    + Patch the examples/octave.desktop.in file, such that the referenced
+      command exists
+    + Rename the installed octave.desktop file
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 22 Sep 2007 17:13:51 +0000
 

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2007-09-23 21:10:42 UTC (rev 1016)
+++ octave/trunk/debian/in/control	2007-09-24 20:40:36 UTC (rev 1017)
@@ -11,7 +11,8 @@
  refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev,
  gnuplot-nox, fftw3-dev, texi2html, less, dpatch,
  slice[V_2_9:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
- libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev:]
+ libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
+ desktop-file-utils:]
 Standards-Version: 3.7.2
 Homepage: http://www.octave.org/
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-09-23 21:10:42 UTC (rev 1016)
+++ octave/trunk/debian/rules	2007-09-24 20:40:36 UTC (rev 1017)
@@ -33,11 +33,13 @@
 
 debbase		:= $(CURDIR)/debian
 debtmp		:= $(debbase)/$(PACKAGE)
-debdoc		:= $(debtmp)/usr/share/doc/$(PACKAGE)
+debshare	:= $(debtmp)/usr/share
+debdoc		:= $(debshare)/doc/$(PACKAGE)
 debhtmldoc	:= $(debtmp)-htmldoc/usr/share/doc/$(PACKAGE)-htmldoc
 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
+debini		:= $(debshare)/octave/site/m/startup
+debininew	:= $(debshare)/octave/$(version)/m/startup
+debapp		:= $(debshare)/applications
 
 savefiles	:= configure config.h.in scripts/configure	\
 			doc/conf.texi examples/octave.desktop.in
@@ -345,7 +347,14 @@
 	rm -vf	$(debtmp)/usr/lib/octave/ls-R \
 		$(debtmp)/usr/share/octave/ls-R
 
-	dh_installexamples  -p$(dev_package)  	examples/*
+	## Rename the desktop file
+	[ -e $(debapp)/www.octave.org-octave.desktop ]		\
+		&& mv $(debapp)/www.octave.org-octave.desktop	\
+			$(debapp)/octave$(major).desktop
+
+	dh_installexamples -p$(dev_package) examples/* \
+		--exclude=octave.desktop
+
 	dh_installmenu -p$(PACKAGE)
 	dh_installchangelogs -a ChangeLog ChangeLog.1
 	for i in glob libcruft liboctave src scripts test doc; do \