[Pkg-octave-commit] rev 158 - trunk/packages/octaviz/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-03-11 14:53:23 +0100 (Fri, 11 Mar 2005)
New Revision: 158

Removed:
   trunk/packages/octaviz/debian/dirs
Modified:
   trunk/packages/octaviz/debian/changelog
   trunk/packages/octaviz/debian/control
   trunk/packages/octaviz/debian/rules
Log:
Final adjustments to make the package compliant with the DOG Guidelines.
Release will follow soon.



Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2005-03-10 13:24:58 UTC (rev 157)
+++ trunk/packages/octaviz/debian/changelog	2005-03-11 13:53:23 UTC (rev 158)
@@ -1,4 +1,4 @@
-octaviz (0.4.0-9) experimental; urgency=low
+octaviz (0.4.0-9) unstable; urgency=low
 
   NOT YET RELEASED !!!
 
@@ -7,6 +7,19 @@
   * debian/control: Changed Maintainer to Debian Octave Group.
   * debian/changelog: Added variables for Emacs debian-changelog-mode.
 
+  +++ Changes by Rafael Laboissiere
+
+  * Uploading to unstable, since libvtk4 version 4.4.2-4 is now in
+    unstable (closes: #279362)
+  * debian/control: Removed explicit dependency of the binary package on
+    libvtk4
+  * debian/rules:
+    - Create target for building the cmake files
+    - Removed old variables that were used for computing the version
+      dependency of the pacakge (this is now done by octave-depends)
+    - Use $(MDIR) and $(OCTDIR) for installing the files, as mandated by
+      the Debian Octave Group Guidelines.
+
  --
 
 octaviz (0.4.0-8) experimental; urgency=low

Modified: trunk/packages/octaviz/debian/control
===================================================================
--- trunk/packages/octaviz/debian/control	2005-03-10 13:24:58 UTC (rev 157)
+++ trunk/packages/octaviz/debian/control	2005-03-11 13:53:23 UTC (rev 158)
@@ -7,7 +7,7 @@
 
 Package: octaviz
 Architecture: any
-Depends: libvtk4 (>= 4.4.2), ${shlibs:Depends}, ${octave:Depends}
+Depends: ${shlibs:Depends}, ${octave:Depends}
 Suggests: vtkdata
 Description: 3D visualization system for Octave
  Octaviz is a visualization system for Octave. It is a wrapper that

Deleted: trunk/packages/octaviz/debian/dirs

Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2005-03-10 13:24:58 UTC (rev 157)
+++ trunk/packages/octaviz/debian/rules	2005-03-11 13:53:23 UTC (rev 158)
@@ -12,13 +12,9 @@
 # Define Makefile variables MDIR and OCTDIR, as sugested in DOG Guidelines.
 include /usr/share/octave/debian/defs.make
 
-octver = $(shell octave-config --version)
-octver_major = $(shell echo $(octver) | cut -f1 -d.)
-octver_minor = $(shell echo $(octver) | cut -f2 -d.)
-octver_micro = $(shell echo $(octver) | cut -f3 -d.)
-octnxtver = $(octver_major).$(octver_minor).$(shell expr $(octver_micro) + 1)
-octdir = $(shell octave-config --m-site-dir)/octaviz/Examples
 debdir = $(CURDIR)/debian/octaviz
+debexa = $(debdir)/usr/share/doc/octaviz/examples
+deboct = $(debdir)$(OCTDIR)
 
 CFLAGS = -Wall -g
 
@@ -28,14 +24,21 @@
 	CFLAGS += -O2
 endif
 
-build: build-stamp
-build-stamp:
+cmake: cmake-stamp
+cmake-stamp:
 	dh_testdir
 
-	# Add here commands to compile the package.
 	cmake .
 	perl -pi -e 's/CMAKE_SKIP_RPATH:BOOL=NO/CMAKE_SKIP_RPATH:BOOL=YES/' \
 	  CMakeCache.txt
+
+	touch cmake-stamp
+
+build: build-stamp
+build-stamp: cmake
+	dh_testdir
+
+	# Add here commands to compile the package.
 	$(MAKE)
 
 	touch build-stamp
@@ -43,7 +46,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp cmake-stamp
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
@@ -64,7 +67,10 @@
 	# Add here commands to install the package into debian/octaviz.
 	$(MAKE) install DESTDIR=$(debdir)
 
-	find $(debdir) -name \*.m | xargs chmod -x
+	dh_installdirs $(debexa) $(deboct)
+	find $(debdir) -name \*.m   | xargs -if mv f $(debexa)
+	chmod -x  $(debexa)/*
+	find $(debdir) -name \*.oct | xargs -if mv f $(deboct)
 
 
 # Build architecture-independent files here.
@@ -77,7 +83,6 @@
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
-	mv $(debdir)$(octdir) $(debdir)/usr/share/doc/octaviz/examples
 	dh_installexamples
 	dh_installman
 	dh_link