[gap-guava] 05/07: Imported Debian patch 3.6-1

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository gap-guava.

commit b69d7d1baff67dee4c31bbc59b8ed9bd932913c0
Author: Tim Abbott <tabbott at mit.edu>
Date:   Fri Jun 20 21:21:29 2008 -0400

    Imported Debian patch 3.6-1
---
 debian/changelog                 |  4 ++--
 debian/control                   |  2 +-
 debian/control.in                |  2 +-
 debian/patches/guava-clean.patch | 52 ----------------------------------------
 debian/patches/series            |  1 -
 5 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eac5efe..1843f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-guava (3.5-1) unstable; urgency=low
+guava (3.6-1) unstable; urgency=low
 
   * Initial release (Closes: #480099).
 
- -- Tim Abbott <tabbott at mit.edu>  Fri, 30 May 2008 18:22:53 -0400
+ -- Tim Abbott <tabbott at mit.edu>  Fri, 20 Jun 2008 21:21:29 -0400
diff --git a/debian/control b/debian/control
index 90d1f74..d0a9dc6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Tim Abbott <tabbott at mit.edu>
 Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), gap-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: gap-guava
 Section: math
diff --git a/debian/control.in b/debian/control.in
index a54401f..e7e1d66 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Tim Abbott <tabbott at mit.edu>
 Build-Depends: @cdbs@, gap-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: gap-guava
 Section: math
diff --git a/debian/patches/guava-clean.patch b/debian/patches/guava-clean.patch
deleted file mode 100644
index 4b3ac1e..0000000
--- a/debian/patches/guava-clean.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: guava-3.5/Makefile.in
-===================================================================
---- guava-3.5.orig/Makefile.in	2008-06-02 12:55:38.000000000 -0400
-+++ guava-3.5/Makefile.in	2008-06-02 13:08:34.000000000 -0400
-@@ -51,9 +51,14 @@
- # pseudo targets
- clean:
- 	( cd bin/@GAPARCH@; rm -f *.o )
-+	( cd src && make clean )
-+	( cd src/leon && make clean )
- 
--distclean:
--	( rm -rf bin/@GAPARCH@ )
-+distclean: clean
-+	( rm -rf bin )
-+	( rm -f Makefile )
-+	( cd src && make distclean )
-+	( cd src/leon && make distclean )
- 
- # for GAP distribution
- src_dist:
-Index: guava-3.5/src/Makefile
-===================================================================
---- guava-3.5.orig/src/Makefile	2008-06-02 12:55:38.000000000 -0400
-+++ guava-3.5/src/Makefile	2008-06-02 13:08:10.000000000 -0400
-@@ -15,3 +15,4 @@
- 
- clean :
- 	rm -f $(FILES)
-+	rm -f *.o
-Index: guava-3.5/src/leon/Makefile.in
-===================================================================
---- guava-3.5.orig/src/leon/Makefile.in	2008-06-02 12:55:38.000000000 -0400
-+++ guava-3.5/src/leon/Makefile.in	2008-06-02 13:08:10.000000000 -0400
-@@ -6,8 +6,9 @@
- LINKOPT = -v
- LINKNAME = -o
- OBJ = o
-+OBJS = setstab cent inter desauto generate commut cjrndper orblist fndelt compgrp orbdes randobj wtdist
- 
--all:   setstab cent inter desauto generate commut cjrndper orblist fndelt compgrp orbdes randobj wtdist
-+all: $(OBJS)
- #
- # Invoke linker -- setstab
- setstab:  setstab.$(OBJ) addsgen.$(OBJ) bitmanp.$(OBJ) chbase.$(OBJ) compcrep.$(OBJ) compsg.$(OBJ) copy.$(OBJ) cparstab.$(OBJ) csetstab.$(OBJ) cstborb.$(OBJ) cstrbas.$(OBJ) cuprstab.$(OBJ) errmesg.$(OBJ) essentia.$(OBJ) factor.$(OBJ) inform.$(OBJ) new.$(OBJ) oldcopy.$(OBJ) optsvec.$(OBJ) orbit.$(OBJ) orbrefn.$(OBJ) partn.$(OBJ) permgrp.$(OBJ) permut.$(OBJ) primes.$(OBJ) ptstbref.$(OBJ) randgrp.$(OBJ) randschr.$(OBJ) readgrp.$(OBJ) readpar.$(OBJ) readper.$(OBJ) readpts.$(OBJ) rprique.$(O [...]
-@@ -181,3 +182,6 @@
- 	$(COMPILE) $(COMPOPT) $(INCLUDES)  $(SRCDIR)/util.c 
- wtdist.$(OBJ) : $(SRCDIR)/group.h $(SRCDIR)/extname.h $(SRCDIR)/groupio.h $(SRCDIR)/errmesg.h $(SRCDIR)/field.h $(SRCDIR)/readdes.h $(SRCDIR)/storage.h $(SRCDIR)/token.h $(SRCDIR)/util.h $(SRCDIR)/wt.h $(SRCDIR)/swt.h $(SRCDIR)/wtdist.c
- 	$(COMPILE) $(COMPOPT) $(INCLUDES)  $(SRCDIR)/wtdist.c 
-+
-+clean:
-+	rm -f *.o $(OBJS) config.log config.status Makefile
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index da8d5de..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-guava-clean.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-guava.git