[Pkg-octave-commit] rev 145 - trunk/packages/semidef-oct/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-03-04 08:41:55 +0100 (Fri, 04 Mar 2005)
New Revision: 145

Modified:
   trunk/packages/semidef-oct/debian/changelog
   trunk/packages/semidef-oct/debian/control
   trunk/packages/semidef-oct/debian/rules
Log:
Debian release semidef-oct_2003-2


Modified: trunk/packages/semidef-oct/debian/changelog
===================================================================
--- trunk/packages/semidef-oct/debian/changelog	2005-03-02 10:10:43 UTC (rev 144)
+++ trunk/packages/semidef-oct/debian/changelog	2005-03-04 07:41:55 UTC (rev 145)
@@ -1,3 +1,19 @@
+semidef-oct (1:2003-2) unstable; urgency=low
+
+  +++ Changes by Rafael Laboissiere
+
+  * Make the package compliant with the Debian Octave Group Guidelines.
+  * debian/rules:
+    - Include defs.make (from octave2.1-headers)
+    - Use variables $(OCTDIR) and $(MDIR) for the installation paths
+    - (binary-arch) Call octave-depends to get the right binary
+      dependencies.
+  * debian/control:
+    - Build-Depends on octave2.1-headers >= 2.1.65
+    - Depends on substitution variable ${octave:Depends}
+
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>  Fri,  4 Mar 2005 08:37:08 +0100
+
 semidef-oct (1:2003-1) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere

Modified: trunk/packages/semidef-oct/debian/control
===================================================================
--- trunk/packages/semidef-oct/debian/control	2005-03-02 10:10:43 UTC (rev 144)
+++ trunk/packages/semidef-oct/debian/control	2005-03-04 07:41:55 UTC (rev 145)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
 Standards-Version: 3.6.1.1
-Build-Depends: octave2.1-headers (>= 2.1.64), g77 [!m68k], fort77 [m68k], debhelper (>= 3.0.0), dpatch
+Build-Depends: octave2.1-headers (>= 2.1.65), g77 [!m68k], fort77 [m68k], debhelper (>= 3.0.0), dpatch
 Build-Conflicts: octave2.0-headers
 
 Package: octave-sp
 Architecture: any
-Depends: octave2.1 (>= 2.1.64), octave2.1 (<< 2.1.65), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${octave:Depends}
 Description: Semidefinite Programming functions for GNU Octave
  The octave-sp package provides functions for semidefinite programming. It
  can be used to solve nonlinear, convex optimization problems. For an

Modified: trunk/packages/semidef-oct/debian/rules
===================================================================
--- trunk/packages/semidef-oct/debian/rules	2005-03-02 10:10:43 UTC (rev 144)
+++ trunk/packages/semidef-oct/debian/rules	2005-03-04 07:41:55 UTC (rev 145)
@@ -4,10 +4,12 @@
 # Copyright (C) 1998 - 2003 by Dirk Eddelbuettel <edd@debian.org>
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/octave/debian/defs.make
 
 PACKAGE	:= $(shell grep Package debian/control | sed 's/^Package: //')
 debtmp	:= $(CURDIR)/debian/tmp
-deboct  := $(shell octave-config --oct-site-dir)
+deboct  := $(OCTDIR)/sp
+debm    := $(MDIR)/sp
 
 get-orig-source: upstream
 upstream:
@@ -31,11 +33,11 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs 			usr/share/octave/site/m/sp \
-					$(deboct)/sp
-	install -s -m 0755 SRC/sp.oct 	$(debtmp)/$(deboct)/sp
+	dh_installdirs 			$(MDIR) \
+					$(OCTDIR)
+	install -s -m 0755 SRC/sp.oct 	$(debtmp)/$(OCTDIR)
 	for i in SRC/*.m debian/*.m; do \
-		install -p -m 0644 $$i  $(debtmp)/usr/share/octave/site/m/sp/;\
+		install -p -m 0644 $$i  $(debtmp)/$(MDIR);\
         done
 	dh_installdocs		README* DOC/*.ps
 #	dh_installexamples	samples/*
@@ -43,14 +45,15 @@
 #	dh_installinit
 #	dh_installcron
 #	dh_installmanpages
-#	dh_undocumented	        
-	dh_installchangelogs	
+#	dh_undocumented
+	dh_installchangelogs
 	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_suidregister
 	dh_installdeb
 	dh_shlibdeps
+	octave-depends
 	dh_gencontrol
 #	dh_makeshlibs
 #	dh_md5sums