[Pkg-octave-commit] rev 36 - in trunk/packages/octave-epstk/debian: . patches

Rafael Laboissiere rafael@costa.debian.org
Thu, 10 Feb 2005 17:46:45 +0100 

Author: rafael
Date: 2005-02-10 17:46:45 +0100 (Thu, 10 Feb 2005)
New Revision: 36

Added:
   trunk/packages/octave-epstk/debian/patches/
   trunk/packages/octave-epstk/debian/patches/00list
   trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
Modified:
   trunk/packages/octave-epstk/debian/changelog
   trunk/packages/octave-epstk/debian/control
   trunk/packages/octave-epstk/debian/rules
Log:
Debian release octave-epstk_2.0.2-1

Modified: trunk/packages/octave-epstk/debian/changelog
===================================================================
--- trunk/packages/octave-epstk/debian/changelog	2005-02-10 14:18:16 UTC (rev 35)
+++ trunk/packages/octave-epstk/debian/changelog	2005-02-10 16:46:45 UTC (rev 36)
@@ -1,3 +1,18 @@
+octave-epstk (2.0.2-1) unstable; urgency=low
+
+  +++ Changes by Rafael Laboissiere:
+
+  * New upstream release
+  * debian/control:
+    - Set maintainer to Debian Octave Group
+    - Build-Depend on dpatch
+  * debian/rules:
+    - Adjusted to use dpatch
+  * debian/patches/50_source-etc-epstk-conf.dpatch:
+    - Added patch for sourcing /etc/epstk.conf in function einit
+
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>  Thu, 10 Feb 2005 17:35:06 +0100
+
 octave-epstk (2.0-6) unstable; urgency=low
 
   * m/*.m: Applied new upstream patch to fix demos (Closes: #247863)
@@ -49,7 +64,7 @@
     - converted upstream .zip files into .orig.tar.gz
     - small patch to einit.m and eview.m to read /etc/epstk.conf
   * This version closes two forwarded bugs (Closes: #125848, #125854)
-  
+
  -- Dirk Eddelbuettel <edd@debian.org>  Tue, 22 Jan 2002 22:48:39 -0600
 
 octave-epstk (1.8-1) unstable; urgency=low
@@ -65,10 +80,10 @@
 
   * Upgraded to new upstream release 1.7
 
-  * As with release 1.6, 
+  * As with release 1.6,
     - converted upstream .zip into .orig.tar.gz
     - small patch to einit.m and eview.m to read /etc/epstk.conf
-  
+
   * debian/control: Added Build-Depends
 
  -- Dirk Eddelbuettel <edd@debian.org>  Thu, 27 Jul 2000 22:12:57 -0400
@@ -76,7 +91,7 @@
 octave-epstk (1.6-2) unstable; urgency=low
 
   * debian/rules: Adapted to use /usr/share/ following the recommendation
-    on FHS transition from the Technical Committee 
+    on FHS transition from the Technical Committee
   * debian/rules: Test for debhelper >= 2.0.40 for FHS compliance
   * debian/control: Upgraded to Debian Policy 3.0.1
 
@@ -84,7 +99,7 @@
 
 octave-epstk (1.6-1) unstable; urgency=low
 
-  * Initial Debian release, with Debian diffs blessed upstream. 
+  * Initial Debian release, with Debian diffs blessed upstream.
 
   * Converted upstream .zip archive into .tar.gz
   * Uncompressed the two (large) .ps files with documentation
@@ -92,12 +107,13 @@
     as README as it is the only document which provides a quick overview
 
   * Created a conffile /etc/epstk.conf for default variables (thanks to
-    Rafael Laboissier for the suggestion) 
+    Rafael Laboissier for the suggestion)
   * einit.m: source("/etc/epstk.conf"); to read Debian configuration
   * eview.m: source("/etc/epstk.conf"); to get value of eViewCommand
-  
+
  -- Dirk Eddelbuettel <edd@debian.org>  Fri,  2 Jul 1999 19:48:18 -0400
 
-
-
-
+Local Variables:
+debian-changelog-full-name: "Debian Octave Group"
+debian-changelog-mailing-address: "pkg-octave-devel@lists.alioth.debian.org"
+End:

Modified: trunk/packages/octave-epstk/debian/control
===================================================================
--- trunk/packages/octave-epstk/debian/control	2005-02-10 14:18:16 UTC (rev 35)
+++ trunk/packages/octave-epstk/debian/control	2005-02-10 16:46:45 UTC (rev 36)
@@ -1,9 +1,9 @@
 Source: octave-epstk
 Section: math
 Priority: optional
-Maintainer: Dirk Eddelbuettel <edd@debian.org>
+Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
 Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>= 3.0.0)
+Build-Depends-Indep: debhelper (>= 3.0.0), dpatch
 
 Package: octave-epstk
 Architecture: all
@@ -12,4 +12,4 @@
  The octave-epstk package provides, via a set of .m functions, a toolkit to
  create powerful encapsulated postscript (.eps) graphs. Most 2D scientific
  graphics functions are written. The generated .eps-files are very small and
- can be imported into other documents without loss of quality. 
+ can be imported into other documents without loss of quality.

Added: trunk/packages/octave-epstk/debian/patches/00list
===================================================================
--- trunk/packages/octave-epstk/debian/patches/00list	2005-02-10 14:18:16 UTC (rev 35)
+++ trunk/packages/octave-epstk/debian/patches/00list	2005-02-10 16:46:45 UTC (rev 36)
@@ -0,0 +1 @@
+50_source-etc-epstk-conf

Added: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch	2005-02-10 14:18:16 UTC (rev 35)
+++ trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch	2005-02-10 16:46:45 UTC (rev 36)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_source-etc-epstk-conf.dpatch by  <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave-epstk 2.0.2-1 diff.gz
+
+@DPATCH@
+
+--- octave-epstk-2.0.2.orig/m/einit.m
++++ octave-epstk-2.0.2/m/einit.m
+@@ -19,6 +19,7 @@
+ else eFac=1;
+ end
+ 
++source ('/etc/epstk.conf');    % source Debian configuration file 
+ 
+ %fonts  (standard fonts of postscript)
+ eFonts=[


Property changes on: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave-epstk/debian/rules
===================================================================
--- trunk/packages/octave-epstk/debian/rules	2005-02-10 14:18:16 UTC (rev 35)
+++ trunk/packages/octave-epstk/debian/rules	2005-02-10 16:46:45 UTC (rev 36)
@@ -3,17 +3,19 @@
 # debian.rules file for the Debian/GNU Linux octave-epstk package
 # Copyright 1999 - 2003 by Dirk Eddelbuettel <edd@debian.org>
 
-package		:= $(shell grep Package debian/control | sed 's/^Package: //')
+include /usr/share/dpatch/dpatch.make
+
+PACKAGE		:= $(shell grep Package debian/control | sed 's/^Package: //')
 debtmp		:= $(shell pwd)/debian/tmp
-debdir		:= $(debtmp)/usr/share/octave/site/m/$(package)
+debdir		:= $(debtmp)/usr/share/octave/site/m/$(PACKAGE)
 
 get-orig-source: upstream
 upstream:
 		#links http://epstk.port5.com/epstk/downloads.html
 		links http://epstk.sourceforge.net/down/
 
-build: 		build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: patch-stamp
 		dh_testdir
 #		nothing to be done for this package of Octave scripts
 #		./configure --prefix=/usr
@@ -21,19 +23,19 @@
 		touch build
 		touch build-stamp
 
-clean:
+clean: unpatch
 		dh_testdir
 		dh_testroot
 		rm -f build-stamp
 #		-test -f Makefile && $(MAKE) realclean
-		-rm -rf *~ $(debtmp) debian/*~ debian/files* build  
+		-rm -rf *~ $(debtmp) debian/*~ debian/files* build
 		dh_clean
 
 binary-indep: build
 		dh_testdir
 		dh_testroot
 		dh_clean -k
-		dh_installdirs		usr/share/octave/site/m/$(package) etc
+		dh_installdirs		usr/share/octave/site/m/$(PACKAGE) etc
                 ##$(MAKE) install
                 ## a bit unsual ...
 		install -p -m 0644 m/*.m m/*.ppm m/*.psd m/*.jpg \
@@ -60,7 +62,7 @@
 
 binary-arch: 	build
 
-source diff:                                                                  
+source diff:
 		@echo >&2 'obsolete targets - use dpkg-source -b'; false
 
 binary: 	binary-indep binary-arch