[gap-io] 01/01: Imported Debian patch 4.2+ds-2

Thu Feb 27 21:23:02 UTC 2014

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

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

commit f3c60bbadd513c2db9b9432b51fbbedacef84627
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Feb 27 20:54:46 2014 +0000

    Imported Debian patch 4.2+ds-2
---
 debian/changelog                   | 14 ++++++++++++++
 debian/clean                       | 13 +++++++++++++
 debian/control                     |  4 ++--
 debian/gap-io.dir                  |  5 -----
 debian/gap-io.install              |  3 ++-
 debian/makedoc.g                   |  6 ++----
 debian/patches/debianization.patch | 11 ++++++++---
 debian/repack                      |  1 +
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52fdc1c..72b985e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gap-io (4.2+ds-2) unstable; urgency=low
+
+  * Debianization:
+    - debian/makedoc.g, revisit;
+    - debiam/clean, add wrt debian/makedoc.g;
+    - debian/repack, revisit wrt debian/makedoc.g;
+    - debian/control, refresh;
+    - debian/gap-io.install:
+      - provide manual.css and manual.js;
+      - install io.so module in pkg/bin as now allowded by GAP 4r7p2-1;
+    - debian/gap-io.dir, remove;
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 27 Feb 2014 20:54:46 +0000
+
 gap-io (4.2+ds-1) unstable; urgency=low
 
   * Initial release (Closes: #734418).
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d28b256
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,13 @@
+doc/chap*.txt
+doc/chap*.html
+doc/chooser.html
+doc/manual.{tex,aux,out,brf,toc,log,bbl,blg,ind,idx,ilg}
+doc/manual.{pnr,six,lab}
+doc/manual.pdf
+doc/lefttoc.css
+doc/manual.{css,js}
+doc/nocolorprompt.css
+doc/ragged.css
+doc/rainbow.js
+doc/times.css
+doc/toggless.{css,js}
diff --git a/debian/control b/debian/control
index 0d11526..2a800a4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9), autotools-dev, libtool, dh-autoreconf, autoconf-archive,
- gap (>=4r5), gap-dev (>=4r5), gap-gapdoc, libgmp-dev,
+ gap (>=4r7), gap-dev (>=4r7), gap-gapdoc, libgmp-dev,
  texlive-latex-extra, texlive-fonts-recommended
 Standards-Version: 3.9.5
 Homepage: http://www.gap-system.org/Packages/io.html
@@ -15,7 +15,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gap-io.
 Package: gap-io
 Provides: gap-pkg-io
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, gap (>=4r5)
+Depends: ${misc:Depends}, ${shlibs:Depends}, gap (>=4r7)
 Description: low level C library IO bindings for GAP
  GAP is a system for computational discrete algebra with particular
  emphasis on computational group theory, but which has already proved
diff --git a/debian/gap-io.dir b/debian/gap-io.dir
deleted file mode 100644
index e36303f..0000000
--- a/debian/gap-io.dir
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/gap/pkg/io
-usr/share/gap/pkg/io/gap
-usr/share/gap/pkg/io/tst
-usr/share/gap/pkg/io/doc
-usr/share/gap/pkg/io/example
diff --git a/debian/gap-io.install b/debian/gap-io.install
index 085653a..743ae3b 100644
--- a/debian/gap-io.install
+++ b/debian/gap-io.install
@@ -1,6 +1,7 @@
-usr/lib/gap/pkg/io/bin/*/io.so
+usr/lib/gap/pkg/io/bin/io.so
 PackageInfo.g init.g makedoc.g read.g VERSION usr/share/gap/pkg/io
 gap/* usr/share/gap/pkg/io/gap
 tst/* usr/share/gap/pkg/io/tst
 doc/*.txt doc/*.html doc/manual.six doc/manual.pdf usr/share/gap/pkg/io/doc
+doc/manual.css doc/manual.js usr/share/gap/pkg/io/doc
 example/* usr/share/gap/pkg/io/example
diff --git a/debian/makedoc.g b/debian/makedoc.g
index 712467d..1f4b28f 100644
--- a/debian/makedoc.g
+++ b/debian/makedoc.g
@@ -5,9 +5,7 @@ if LoadPackage("io") <> true then
 fi;
 #DisplayPackageLoadingLog(PACKAGE_DEBUG);
 LoadPackage("GAPDoc");
-MakeGAPDocDoc("doc", "io", [], "IO", "../../..");
+MakeGAPDocDoc("doc","io",[],"IO");;
+CopyHTMLStyleFiles("doc");
 GAPDocManualLab("IO");
-#quit;
-Print("quitting ...\n");
-QUIT;
 ## eos
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 30a20ce..be008b2 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,7 +2,7 @@ Description: debianization
 	Meant to maintain a minimal debian/rules, to fix warnings,
 	to address Debian specific stuff in general.
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-01-08
+Last-Update: 2014-02-27
 
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -15,7 +15,7 @@ Last-Update: 2014-01-08
  
  BINARCHDIR = bin/$(GAPARCH)
  GAPINSTALLLIB = $(abs_top_srcdir)/$(BINARCHDIR)/io.so
-@@ -12,7 +12,7 @@
+@@ -12,11 +12,11 @@
  io_la_SOURCES = src/io.c
  io_la_CPPFLAGS = $(GAP_CPPFLAGS) -DCONFIG_H
  # Note that the latter is only for GAP 4.4.12
@@ -24,6 +24,11 @@ Last-Update: 2014-01-08
  if SYS_IS_CYGWIN
  io_la_LDFLAGS += -no-undefined -version-info 0:0:0 -Wl,$(GAPROOT)/bin/$(GAPARCH)/gap.dll
  endif
+-libdir = @GAPROOT@/pkg/io/bin/@GAPARCH@
++libdir = @GAPROOT@/pkg/io/bin
+ 
+ all-local: doc
+ 
 @@ -30,13 +30,14 @@
  ##	@echo "SUCCESS!"
  
@@ -37,7 +42,7 @@ Last-Update: 2014-01-08
  doc/manual.six: doc/main.xml doc/io.xml VERSION
 -	$(GAP) makedoc.g
 +	$(MKDIR_P) bin && cd bin && $(LN_S) ../.libs @GAPARCH@
-+	$(GAP) -A debian/makedoc.g
++	cat debian/makedoc.g | $(GAP) -A
  
  archive: doc
  	(cd .. ; tar czvf io-`cat io/VERSION`.tar.gz --exclude ".svn" --exclude bin --exclude test --exclude ".git" --exclude ".libs" --exclude lib --exclude io.la --exclude io_la-io.lo --exclude .deps --exclude autom4te.cache --exclude .gitignore --exclude config.log --exclude stamp-h1 --exclude pkgconfig.h --exclude libtool --exclude config.status io)
diff --git a/debian/repack b/debian/repack
index 23308e0..58f5e4a 100755
--- a/debian/repack
+++ b/debian/repack
@@ -83,6 +83,7 @@ rm --verbose --force -- doc/chap*.html
 rm --verbose --force -- doc/io.{tex,aux,toc,log,bbl,blg,ind,idx,ilg}
 rm --verbose --force -- doc/io.pnr
 rm --verbose --force -- doc/manual.{pdf,six,lab}
+rm --verbose --force -- doc/manual.css
 #:
 
 cd ${REPACK_WORKING_FOLDER}

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

