[Pkg-octave-commit] rev 269 - trunk/packages/statdataml/debian

Tue Sep 27 20:49:22 UTC 2005

Author: rafael
Date: 2005-09-27 20:49:22 +0000 (Tue, 27 Sep 2005)
New Revision: 269

Removed:
   trunk/packages/statdataml/debian/get-oct-cfg.sh
   trunk/packages/statdataml/debian/octave-deps
Modified:
   trunk/packages/statdataml/debian/
   trunk/packages/statdataml/debian/changelog
   trunk/packages/statdataml/debian/control
   trunk/packages/statdataml/debian/rules
   trunk/packages/statdataml/debian/watch
Log:
Preparatiopn for Debian release 1.0.10-1.  The regression test does
not work on sid.  I will investigated this later.



Property changes on: trunk/packages/statdataml/debian
___________________________________________________________________
Name: svn:ignore
   + files
octave-statdataml.substvars
octave-statdataml
r-cran-statdataml.substvars
r-cran-statdataml


Modified: trunk/packages/statdataml/debian/changelog
===================================================================

--- trunk/packages/statdataml/debian/changelog	2005-09-26 15:35:58 UTC (rev 268)
+++ trunk/packages/statdataml/debian/changelog	2005-09-27 20:49:22 UTC (rev 269)
@@ -1,3 +1,24 @@
+statdataml (1.0.10-1) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  +++ Changes by Rafael Laboissiere
+
+  * New upstream release.  Recompiled against latest hdf5 package in sid
+    (closes: #328203).
+  * This version needs the previous upstream tarball (version 1.0-9) which
+    contains the Octave code.
+  * debian/control:
+    - Changed maintainer to the Debian Octave Group
+    - Upgraded Standards-Version to 3.6.2 (no changes needed)
+    - Build-depends on octave2.1-headers >= 2.1.65, as mandated by the DOG
+      Guidelines
+  * debian/rules:
+    - Adjusted for changes in the layout of the upstream tarball
+    - Include defs.make from the octave2.1-headers package
+
+ --
+
 statdataml (1.0.9-1) unstable; urgency=low
 
   * New upstream release.
@@ -123,3 +144,15 @@
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 15 Jul 2003 21:00:59 +0200
 
+Local Variables:
+debian-changelog-full-name: "Debian Octave Group"
+debian-changelog-mailing-address: "pkg-octave-devel at lists.alioth.debian.org"
+eval: (add-local-hook
+  'debian-changelog-add-version-hook
+  (lambda ()
+    (save-excursion
+      (forward-line -1)
+      (beginning-of-line)
+      (insert "\n   NOT YET RELEASED!\n\n   +++ Changes by "
+        (or (getenv "DEBFULLNAME") (user-full-name)) "\n"))))
+End:

Modified: trunk/packages/statdataml/debian/control
===================================================================
--- trunk/packages/statdataml/debian/control	2005-09-26 15:35:58 UTC (rev 268)
+++ trunk/packages/statdataml/debian/control	2005-09-27 20:49:22 UTC (rev 269)
@@ -1,10 +1,10 @@
 Source: statdataml
 Section: math
 Priority: optional
-Maintainer: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>> 4.0.0), r-base-dev (>= 2.0.0), octave2.1-headers (>= 2.1.57), libxml2-dev, autoconf, fort77 [m68k]
+Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
+Build-Depends: debhelper (>> 4.0.0), r-base-dev (>= 2.0.0), octave2.1-headers (>= 2.1.65), libxml2-dev, autoconf
 Build-Conflicts: libxml-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 
 Package: r-cran-statdataml
 Architecture: any

Deleted: trunk/packages/statdataml/debian/get-oct-cfg.sh

Deleted: trunk/packages/statdataml/debian/octave-deps

Modified: trunk/packages/statdataml/debian/rules
===================================================================
--- trunk/packages/statdataml/debian/rules	2005-09-26 15:35:58 UTC (rev 268)
+++ trunk/packages/statdataml/debian/rules	2005-09-27 20:49:22 UTC (rev 269)
@@ -5,6 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/octave/debian/defs.make
+
 PACKAGE := statdataml
 
 rpkg    := r-cran-statdataml
@@ -12,9 +14,8 @@
 debdir  := $(shell pwd)/debian/
 rlibdir := $(debdir)/$(rpkg)/usr/lib/R/library
 octdir  := $(debdir)/$(octpkg)
-octarch := $(octdir)$(shell chmod +x debian/get-oct-cfg.sh ; \
-                            debian/get-oct-cfg.sh localoctfiledir)/statdataml
-octfcn  := $(octdir)$(shell debian/get-oct-cfg.sh localfcnfiledir)/statdataml
+deboct  := $(octdir)$(OCTDIR)
+debfcn  := $(octdir)$(MDIR)
 
 CFLAGS = -Wall -g
 
@@ -32,8 +33,8 @@
 
 unpack: unpack-stamp
 unpack-stamp:
-	tar xfvz StatDataML_1.0-9.tar.gz
-#	tar xfvz StatDataML_1.0-6.tar.gz StatDataML/MatOct
+	tar xfvz StatDataML_1.0-10.tar.gz
+	tar xfvz StatDataML_1.0-9.tar.gz StatDataML/MatOct
 	( cd StatDataML ; patch -p1 < $(debdir)/octave-map-assign.patch )
 	touch unpack-stamp
 
@@ -64,13 +65,13 @@
 	dh_clean -k
 
 	mkdir -p $(rlibdir)
-	R CMD INSTALL -c -l $(rlibdir) StatDataML/R/StatDataML
+	R CMD INSTALL -c -l $(rlibdir) StatDataML
 	rm -f $(rlibdir)/R.css
 
-	mkdir -p $(octarch)
-	mkdir -p $(octfcn)
+	mkdir -p $(deboct)
+	mkdir -p $(debfcn)
 	( cd StatDataML/MatOct/octave ; \
-	  cp *.oct $(octarch) ; cp *.m *.dtd $(octfcn) )
+	  cp *.oct $(deboct) ; cp *.m *.dtd $(debfcn) )
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -83,9 +84,8 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
+	octave-depends
 	dh_shlibdeps -a
-	chmod +x debian/octave-deps
-	debian/octave-deps -p$(octpkg)
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

Modified: trunk/packages/statdataml/debian/watch
===================================================================
--- trunk/packages/statdataml/debian/watch	2005-09-26 15:35:58 UTC (rev 268)
+++ trunk/packages/statdataml/debian/watch	2005-09-27 20:49:22 UTC (rev 269)
@@ -2,4 +2,4 @@
 version=2
 
 # This is one format for an HTTP site, which is the same as the FTP format
-http://cran.r-project.org/src/contrib/StatDataML_([-0-9\.]*).tar.gz
+http://cran.r-project.org/src/contrib/StatDataML_([\d\.]+)-([\d]+).tar.gz


