[Pkg-octave-commit] rev 376 - in trunk/packages/octaviz/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2005-12-13 10:51:58 +0000 (Tue, 13 Dec 2005)
New Revision: 376

Modified:
   trunk/packages/octaviz/debian/changelog
   trunk/packages/octaviz/debian/patches/
   trunk/packages/octaviz/debian/rules
Log:
Use debhelper.mk from CDBS in debian/rules.  This is not yet fully
tested (the octaviz package takes so long to build...)


Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2005-12-06 04:41:43 UTC (rev 375)
+++ trunk/packages/octaviz/debian/changelog	2005-12-13 10:51:58 UTC (rev 376)
@@ -4,21 +4,12 @@
 
    +++ Changes by Rafael Laboissiere
 
-  * This is a preparation for the next release.  The changes in
-    debian./control for compiling in sarge are reverted.
+  * debian/rules:
+    - Use debhelper.mk from CDBS
+    - General cleanup
 
  --
 
-octaviz (0.4.0-11.sarge.1) unstable; urgency=low
-
-   +++ Changes by Rafael Laboissiere
-
-  * Built for sarge (the downgraded release version is to ensure that the
-    transition 0.4.0-11.sarge-1 -> 0.4.0-12 will be smooth when upgrading
-    from sarge to testing/unstable).
-
- -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Thu, 13 Oct 2005 12:04:39 +0200
-
 octaviz (0.4.0-12) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere


Property changes on: trunk/packages/octaviz/debian/patches
___________________________________________________________________
Name: svn:ignore
   + cast-pointer-long.patch.level-0.log
cast-pointer-long.patch.level-1.log


Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2005-12-06 04:41:43 UTC (rev 375)
+++ trunk/packages/octaviz/debian/rules	2005-12-13 10:51:58 UTC (rev 376)
@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# debian/rules for octaviz
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
+DEB_COMPRESS_EXCLUDE := .m
+DEB_DH_SHLIBDEPS_ARGS := --exclude=site
+
 # Define Makefile variables MDIR and OCTDIR, as sugested in DOG Guidelines.
 include /usr/share/octave/debian/defs.make
 
@@ -32,43 +32,24 @@
 cmake: cmake-stamp
 cmake-stamp:
 	dh_testdir
-
 	cmake -DCMAKE_SKIP_RPATH:BOOL=YES .
-
 	touch cmake-stamp
 
 build: build-stamp
 build-stamp: cmake
 	dh_testdir
-
-	# Add here commands to compile the package.
 	$(MAKE)
-
 	touch build-stamp
 
 clean::
-	dh_testdir
-	dh_testroot
 	rm -f build-stamp cmake-stamp
-
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
-
 	find . -name \*.o -o -name Makefile -o -name cmake.\* \
                           -o -name \*.cmake -o -name \*.log \
             | xargs rm -f
 	rm -f CMakeCache.txt install_manifest.txt
 
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	# Add here commands to install the package into debian/octaviz.
-	$(MAKE) install DESTDIR=$(debdir)
-
+binary-install/octaviz::
 	dh_installdirs $(docdir) $(OCTDIR) $(MDIR)
 	find $(debdir) -name \*.m | xargs -if chmod -x f
 	mv `find $(debdir)/usr/share/octave -name Examples` $(debdoc)/examples
@@ -76,28 +57,7 @@
 	mv `find $(debdir)/usr/lib/octave -name octaviz` $(deboct)
 	rm -rf $(debdir)/usr/*/octave/2.1*
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress --exclude=.m
-	dh_fixperms
-	dh_installdeb
+binary-predeb/octaviz::
 	octave-depends
-	dh_shlibdeps --exclude=site
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build