[Pkg-octave-commit] [SCM] octave-octgpr branch, master, updated. 4058870ccffe1d8950390315341978737b75451f

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 4058870ccffe1d8950390315341978737b75451f
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue May 19 21:24:54 2009 +0200

    Drop patches, which have been applied upstream
    
    Also, drop quilt from Build-Depends and remove the obsolete file
    debian/README.source.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f8067ac..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream sources.
-See `/usr/share/doc/quilt/README.source' to get more information on how to
-use it.
-
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:50:41 +0200
diff --git a/debian/changelog b/debian/changelog
index ffdd1f8..0a67525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 octave-octgpr (1.1.5-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/{gfortran-fpic,link-with-pakgpr}.diff: Drop patches
+    (applied upstream)
+  * debian/README.source: Remove unneeded file
+  * debian/control: Drop quilt from Build-Depends
   * debian/copyright: Use DEP5 URL in Format-Specification
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 17 May 2009 22:49:53 +0200
diff --git a/debian/control b/debian/control
index f90a8c2..26fdccc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.6.4), gnuplot-nox, quilt
+Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.6.4),
+ gnuplot-nox
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/octgpr/
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-octgpr.git
diff --git a/debian/patches/gfortran-fpic.diff b/debian/patches/gfortran-fpic.diff
deleted file mode 100644
index 2d4ac77..0000000
--- a/debian/patches/gfortran-fpic.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Use -fPIC flags to compile the Octave modules.
-
- -- Rafale Laboissiere <rafael at debian.org>  Mon, 3 Mar 2008 17:10:44 +0100
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -17,9 +17,9 @@
- 
- F77=@F77@
- MKOCTFILE=@MKOCTFILE@
--FFLAGS=@FFLAGS@
-+FFLAGS=@FFLAGS@ -fPIC
- CC=@CC@
--CFLAGS=@CFLAGS@ -I.
-+CFLAGS=@CFLAGS@ -I. -fPIC
- LIBS=@LIBS@
- 
- OBJS_GPR_TRAIN=dsdacc.o dwdis2.o dtr2tp.o \
diff --git a/debian/patches/link-with-pakgpr.diff b/debian/patches/link-with-pakgpr.diff
deleted file mode 100644
index 3b9aa9f..0000000
--- a/debian/patches/link-with-pakgpr.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Include pakgpr in the list of dependecies of gpr_train.  The Fortran
-function pakgpr is called in setup.c.
-
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 15 Apr 2009 11:48:12 +0200
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -30,7 +30,7 @@
- 	       nllgpr.o nldgpr.o nl0gpr.o corrf.o stheta.o \
- 	       dscrot.o dscsev.o dspmid.o dxnrm2.o \
- 	       trstp.o sr1upd.o optdrv.o \
--	       get_corrf.o train.o setup.o 
-+	       get_corrf.o train.o setup.o pakgpr.o
- 	       
- OBJS_GPR_PRED=dsdacc.o dwdis2.o infgpr.o corrf.o \
- 	      get_corrf.o predict.o 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 49a479c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-gfortran-fpic.diff
-link-with-pakgpr.diff

-- 
octave-octgpr