[gts] 14/25: Import Upstream version 0.7.6+darcs100321
Andreas Tille
tille at debian.org
Tue Jan 31 12:40:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository gts.
commit bcd5da3a2edfc21e3fdb56cbc8e880838b880a40
Author: Andreas Tille <tille at debian.org>
Date: Tue Jan 31 11:38:48 2017 +0100
Import Upstream version 0.7.6+darcs100321
---
ChangeLog | 62 +++++++
Makefile.am | 23 ++-
Makefile.in | 33 +++-
config.h.in | 3 +
configure | 286 +++++++++++++++++++++++++++++-
configure.in | 18 +-
debian/Makefile.am | 6 +
debian/Makefile.in | 348 +++++++++++++++++++++++++++++++++++++
debian/changelog.sh | 11 ++
debian/compat | 1 +
debian/control | 44 +++++
debian/copyright | 4 +
debian/libgts-snapshot-dev.install | 7 +
debian/libgts-snapshot-doc.docs | 1 +
debian/libgts-snapshot.install | 22 +++
debian/libgts-snapshot.symbols | 1 +
debian/rules | 10 ++
examples/happrox.c | 6 +-
gts.spec.in | 75 --------
src/misc.c | 32 +++-
20 files changed, 898 insertions(+), 95 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 558f653..6dd5a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+Mon Mar 22 02:56:48 NZDT 2010 Stephane Popinet <popinet at users.sf.net>
+ tagged 2010-03-21
+
+Sun Mar 21 20:34:30 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Fixed conflicts with default debian package
+ Ignore-this: bb5a0f540259d966a0250b59fd342f76
+
+Fri Mar 19 02:57:32 NZDT 2010 Stephane Popinet <popinet at users.sf.net>
+ tagged 2010-03-18
+
+Thu Mar 18 20:21:23 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Updated packaging rules for debian and buildservice
+ Ignore-this: aa37b682d66f45fbdb6a8c5b7030b029
+
+Wed Mar 17 20:32:50 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * gts.spec supports SLED10 rather than openSUSE 11.0
+ Ignore-this: 602099f4860001ae9a863789b00f6833
+
+Thu Mar 18 02:17:57 NZDT 2010 Stephane Popinet <popinet at users.sf.net>
+ tagged 2010-03-17
+
+Wed Mar 17 14:07:03 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Fixed incomplete netpbm library check
+ Ignore-this: df601bcb7a6403b84db0d2c1bcfee1ed
+
+Tue Mar 16 16:04:08 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Added buildservice-snapshot makefile target
+ Ignore-this: 8d308ac08d4a5ffd3ebace5cce92040c
+
+Tue Mar 16 10:42:00 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Added configure support for netpbm include directory
+ Ignore-this: db2365fc0cdd8c40a7edf0f579d7a5ec
+
+Tue Mar 16 10:04:44 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Updated RPM spec file for use with buildservice
+ Ignore-this: 57b2c25def646536fa5518104e251ef6
+
+Fri Mar 12 15:39:04 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Changed DTD definition for docs
+ Ignore-this: 875dbf923b9ae8d29597e622ba34006d
+
+Wed Feb 3 20:48:14 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Changed ubuntu distribution to jaunty
+
+Sun Jan 31 07:34:13 NZDT 2010 Stephane Popinet <popinet at users.sf.net>
+ tagged 2010-01-29
+
+Fri Jan 29 23:42:41 NZDT 2010 Stephane Popinet <s.popinet at niwa.co.nz>
+ * gts_file_assign_variables() supports quoted GTS_STRINGs
+
+Thu Sep 10 03:03:53 NZST 2009 Stephane Popinet <popinet at users.sf.net>
+ tagged 2009-09-08
+
+Wed Sep 9 10:39:16 NZST 2009 Stephane Popinet <s.popinet at niwa.co.nz>
+ * Fixed incorrect man pages install directory in RPM spec
+
+Tue Sep 8 10:03:56 NZST 2009 Matthieu Castellazzi <m.castellazzi at niwa.co.nz>
+ * add man pages to rpm spec file
+
+Sun May 10 17:53:23 NZST 2009 Stephane Popinet <popinet at users.sf.net>
+ * Added 'launchpad-snapshot' Makefile target
+
Sat May 9 11:32:01 NZST 2009 Stephane Popinet <popinet at users.sf.net>
* autogen.sh copies missing files
diff --git a/Makefile.am b/Makefile.am
index 5ac5d0f..fb17f12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src tools examples doc test
+SUBDIRS = src tools examples doc test debian
+
+OSC_DIR=$(HOME)/local/src/osc/home:popinet/$(PACKAGE)-snapshot
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gts.pc
@@ -15,3 +17,22 @@ debian-snapshot: config.h
rm -f debian/repo/*
mv -f ../*.changes ../*.deb debian/repo
cd debian/repo && dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
+
+launchpad-snapshot: config.h dist
+ tar xzf $(PACKAGE)-?.?.?.tar.gz
+ cd $(PACKAGE)-?.?.? && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && dpkg-buildpackage -rfakeroot -k07AB22DC -S -sa
+ rm -f $(PACKAGE)-?.?.?.tar.gz
+ rm -r -f $(PACKAGE)-?.?.?
+
+buildservice-snapshot: config.h dist
+ tar xzf $(PACKAGE)-?.?.?.tar.gz
+ rm -f $(PACKAGE)-?.?.?.tar.gz
+ mv -f $(PACKAGE)-?.?.? $(PACKAGE)-snapshot
+ cd $(PACKAGE)-snapshot && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && chmod +x debian/rules && make distclean
+ tar czvf $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot
+ dpkg-source -b $(PACKAGE)-snapshot
+ rm -r -f $(PACKAGE)-snapshot
+ cd $(OSC_DIR) && osc update && rm -f $(OSC_DIR)/*
+ cp -f rpm/$(PACKAGE).spec $(OSC_DIR)
+ mv -f $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot_*.tar.gz $(PACKAGE)-snapshot_*.dsc $(OSC_DIR)
+ cd $(OSC_DIR) && osc addremove && osc commit -m "snapshot release"
diff --git a/Makefile.in b/Makefile.in
index cab6af2..b059e86 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,10 +37,9 @@ POST_UNINSTALL = :
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/gts.pc.in $(srcdir)/gts.spec.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- THANKS TODO config.guess config.sub depcomp install-sh \
- ltmain.sh missing
+ $(srcdir)/gts.pc.in $(top_srcdir)/configure AUTHORS COPYING \
+ ChangeLog INSTALL NEWS THANKS TODO config.guess config.sub \
+ depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -51,7 +50,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(mkdir_p)
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = gts.pc gts.spec
+CONFIG_CLEAN_FILES = gts.pc
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -206,7 +205,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = src tools examples doc test
+SUBDIRS = src tools examples doc test debian
+OSC_DIR = $(HOME)/local/src/osc/home:popinet/$(PACKAGE)-snapshot
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gts.pc
all: config.h
@@ -265,8 +265,6 @@ distclean-hdr:
-rm -f config.h stamp-h1
gts.pc: $(top_builddir)/config.status $(srcdir)/gts.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-gts.spec: $(top_builddir)/config.status $(srcdir)/gts.spec.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -667,6 +665,25 @@ debian-snapshot: config.h
rm -f debian/repo/*
mv -f ../*.changes ../*.deb debian/repo
cd debian/repo && dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
+
+launchpad-snapshot: config.h dist
+ tar xzf $(PACKAGE)-?.?.?.tar.gz
+ cd $(PACKAGE)-?.?.? && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && dpkg-buildpackage -rfakeroot -k07AB22DC -S -sa
+ rm -f $(PACKAGE)-?.?.?.tar.gz
+ rm -r -f $(PACKAGE)-?.?.?
+
+buildservice-snapshot: config.h dist
+ tar xzf $(PACKAGE)-?.?.?.tar.gz
+ rm -f $(PACKAGE)-?.?.?.tar.gz
+ mv -f $(PACKAGE)-?.?.? $(PACKAGE)-snapshot
+ cd $(PACKAGE)-snapshot && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && chmod +x debian/rules && make distclean
+ tar czvf $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot
+ dpkg-source -b $(PACKAGE)-snapshot
+ rm -r -f $(PACKAGE)-snapshot
+ cd $(OSC_DIR) && osc update && rm -f $(OSC_DIR)/*
+ cp -f rpm/$(PACKAGE).spec $(OSC_DIR)
+ mv -f $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot_*.tar.gz $(PACKAGE)-snapshot_*.dsc $(OSC_DIR)
+ cd $(OSC_DIR) && osc addremove && osc commit -m "snapshot release"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/config.h.in b/config.h.in
index a837a9e..c716eb6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -60,6 +60,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define if netpbm include files are in netpbm/. */
+#undef NETPBM_INCLUDE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/configure b/configure
index 1c6735d..79e62f8 100755
--- a/configure
+++ b/configure
@@ -20914,7 +20914,279 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking for pgm_init in -lnetpbm" >&5
+if test "${ac_cv_header_pgm_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for pgm.h" >&5
+echo $ECHO_N "checking for pgm.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_pgm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_pgm_h" >&5
+echo "${ECHO_T}$ac_cv_header_pgm_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking pgm.h usability" >&5
+echo $ECHO_N "checking pgm.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <pgm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking pgm.h presence" >&5
+echo $ECHO_N "checking pgm.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <pgm.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: pgm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: pgm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pgm.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: pgm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: pgm.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: pgm.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pgm.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: pgm.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pgm.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: pgm.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pgm.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: pgm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pgm.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: pgm.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: pgm.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: pgm.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for pgm.h" >&5
+echo $ECHO_N "checking for pgm.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_pgm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_pgm_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_pgm_h" >&5
+echo "${ECHO_T}$ac_cv_header_pgm_h" >&6; }
+
+fi
+if test $ac_cv_header_pgm_h = yes; then
+ netpbm="true"
+else
+ netpbm="false"
+fi
+
+
+if test x$netpbm = xfalse ; then
+ if test "${ac_cv_header_netpbm_pgm_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for netpbm/pgm.h" >&5
+echo $ECHO_N "checking for netpbm/pgm.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_netpbm_pgm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_netpbm_pgm_h" >&5
+echo "${ECHO_T}$ac_cv_header_netpbm_pgm_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking netpbm/pgm.h usability" >&5
+echo $ECHO_N "checking netpbm/pgm.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <netpbm/pgm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking netpbm/pgm.h presence" >&5
+echo $ECHO_N "checking netpbm/pgm.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <netpbm/pgm.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: netpbm/pgm.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: netpbm/pgm.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for netpbm/pgm.h" >&5
+echo $ECHO_N "checking for netpbm/pgm.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_netpbm_pgm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_netpbm_pgm_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_netpbm_pgm_h" >&5
+echo "${ECHO_T}$ac_cv_header_netpbm_pgm_h" >&6; }
+
+fi
+if test $ac_cv_header_netpbm_pgm_h = yes; then
+ netpbm="true"
+
+cat >>confdefs.h <<\_ACEOF
+#define NETPBM_INCLUDE 1
+_ACEOF
+
+else
+ netpbm="false"
+fi
+
+
+fi
+if test x$netpbm = xtrue ; then
+ { echo "$as_me:$LINENO: checking for pgm_init in -lnetpbm" >&5
echo $ECHO_N "checking for pgm_init in -lnetpbm... $ECHO_C" >&6; }
if test "${ac_cv_lib_netpbm_pgm_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20978,10 +21250,14 @@ echo "${ECHO_T}$ac_cv_lib_netpbm_pgm_init" >&6; }
if test $ac_cv_lib_netpbm_pgm_init = yes; then
netpbm="true"
else
- { echo "$as_me:$LINENO: WARNING: libnetpbm not found. Some programs will not be available." >&5
-echo "$as_me: WARNING: libnetpbm not found. Some programs will not be available." >&2;}
+ netpbm="false"
fi
+fi
+if test x$netpbm = xfalse ; then
+ { echo "$as_me:$LINENO: WARNING: libnetpbm not found. Some programs will not be available." >&5
+echo "$as_me: WARNING: libnetpbm not found. Some programs will not be available." >&2;}
+fi
if test x$netpbm = xtrue; then
@@ -22537,7 +22813,7 @@ fi
done
-ac_config_files="$ac_config_files Makefile gts.pc gts.spec src/Makefile src/gts-config tools/Makefile doc/Makefile doc/manpages/Makefile examples/Makefile test/Makefile test/boolean/Makefile test/delaunay/Makefile test/coarsen/Makefile"
+ac_config_files="$ac_config_files Makefile gts.pc src/Makefile src/gts-config tools/Makefile doc/Makefile doc/manpages/Makefile examples/Makefile test/Makefile test/boolean/Makefile test/delaunay/Makefile test/coarsen/Makefile debian/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -23155,7 +23431,6 @@ do
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"gts.pc") CONFIG_FILES="$CONFIG_FILES gts.pc" ;;
- "gts.spec") CONFIG_FILES="$CONFIG_FILES gts.spec" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/gts-config") CONFIG_FILES="$CONFIG_FILES src/gts-config" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
@@ -23166,6 +23441,7 @@ do
"test/boolean/Makefile") CONFIG_FILES="$CONFIG_FILES test/boolean/Makefile" ;;
"test/delaunay/Makefile") CONFIG_FILES="$CONFIG_FILES test/delaunay/Makefile" ;;
"test/coarsen/Makefile") CONFIG_FILES="$CONFIG_FILES test/coarsen/Makefile" ;;
+ "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/configure.in b/configure.in
index 297163e..b7fba5d 100644
--- a/configure.in
+++ b/configure.in
@@ -67,8 +67,20 @@ AC_PROG_AWK
AC_ISC_POSIX
AC_HEADER_STDC
-AC_CHECK_LIB(netpbm, pgm_init, netpbm="true",
- AC_MSG_WARN([libnetpbm not found. Some programs will not be available.]), [-lm])
+AC_CHECK_HEADER(pgm.h, netpbm="true", netpbm="false")
+if test x$netpbm = xfalse ; then
+ AC_CHECK_HEADER(netpbm/pgm.h,
+ [netpbm="true"
+ AC_DEFINE(NETPBM_INCLUDE, 1,
+ [Define if netpbm include files are in netpbm/.])],
+ netpbm="false")
+fi
+if test x$netpbm = xtrue ; then
+ AC_CHECK_LIB(netpbm, pgm_init, netpbm="true", netpbm="false", [-lm])
+fi
+if test x$netpbm = xfalse ; then
+ AC_MSG_WARN([libnetpbm not found. Some programs will not be available.])
+fi
AM_CONDITIONAL(HAS_NETPBM, test x$netpbm = xtrue)
AM_PATH_GLIB_2_0(2.4.0, has_glib2=yes, has_glib2=no, gthread gmodule)
@@ -249,7 +261,6 @@ AC_CHECK_FUNCS(getopt_long)
AC_CONFIG_FILES([
Makefile
gts.pc
-gts.spec
src/Makefile
src/gts-config
tools/Makefile
@@ -260,5 +271,6 @@ test/Makefile
test/boolean/Makefile
test/delaunay/Makefile
test/coarsen/Makefile
+debian/Makefile
])
AC_OUTPUT
diff --git a/debian/Makefile.am b/debian/Makefile.am
new file mode 100644
index 0000000..ae4a291
--- /dev/null
+++ b/debian/Makefile.am
@@ -0,0 +1,6 @@
+EXTRA_DIST = changelog.sh compat control copyright \
+ libgts-snapshot-dev.install \
+ libgts-snapshot-doc.docs \
+ libgts-snapshot.install \
+ libgts-snapshot.symbols \
+ rules
diff --git a/debian/Makefile.in b/debian/Makefile.in
new file mode 100644
index 0000000..79f9c45
--- /dev/null
+++ b/debian/Makefile.in
@@ -0,0 +1,348 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = debian
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_CONFIG = @GLIB_CONFIG@
+GLIB_DEPLIBS = @GLIB_DEPLIBS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTS_MAJOR_VERSION = @GTS_MAJOR_VERSION@
+GTS_MICRO_VERSION = @GTS_MICRO_VERSION@
+GTS_MINOR_VERSION = @GTS_MINOR_VERSION@
+GTS_VERSION = @GTS_VERSION@
+HAS_NETPBM_FALSE = @HAS_NETPBM_FALSE@
+HAS_NETPBM_TRUE = @HAS_NETPBM_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+glib_cflags = @glib_cflags@
+glib_libs = @glib_libs@
+glib_module_cflags = @glib_module_cflags@
+glib_module_libs = @glib_module_libs@
+glib_thread_cflags = @glib_thread_cflags@
+glib_thread_libs = @glib_thread_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = changelog.sh compat control copyright \
+ libgts-snapshot-dev.install \
+ libgts-snapshot-doc.docs \
+ libgts-snapshot.install \
+ libgts-snapshot.symbols \
+ rules
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu debian/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/debian/changelog.sh b/debian/changelog.sh
new file mode 100644
index 0000000..9246cf7
--- /dev/null
+++ b/debian/changelog.sh
@@ -0,0 +1,11 @@
+GTS_VERSION=`grep GTS_MAJOR_VERSION config.h | awk '{print $3;}'`.`grep GTS_MINOR_VERSION config.h | awk '{print $3;}'`.`grep GTS_MICRO_VERSION config.h | awk '{print $3;}'`
+
+version=`date +%y%m%d`
+date=`date +"%a, %e %b %Y %T %z"`
+cat <<EOF > debian/changelog
+gts-snapshot ($GTS_VERSION-$version) jaunty; urgency=low
+
+ * gts-snapshot release (based on Ruben Molina's official debian)
+
+ -- Stephane Popinet <popinet at users.sf.net> $date
+EOF
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..ca3a298
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,44 @@
+Source: gts-snapshot
+Section: math
+Priority: optional
+Maintainer: Stephane Popinet <popinet at users.sf.net>
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libglib2.0-dev, libnetpbm10-dev, gtk-doc-tools (>= 1.3-4)
+Homepage: http://gts.sourceforge.net/
+
+Package: libgts-snapshot-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev, libgts-snapshot (= ${binary:Version})
+Conflicts: libgts-dev, libgts-bin
+Suggests: libgts-snapshot-doc
+Description: GTS Library (development snapshot)
+ GTS includes a number of useful functions to deal with triangulated
+ surfaces including, but not limited to, multi-resolution models,
+ Delaunay and Constrained Delaunay triangulations, set operations on
+ surfaces (intersection, union etc ...), bounding-boxes trees for
+ efficient collision and intersection detection, triangle strips and
+ binary heaps.
+
+Package: libgts-snapshot
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgts-0.7-1, libgts-0.7.5, libgts-bin
+Description: GTS Library (development snapshot) -- runtime environment
+ GTS includes a number of useful functions to deal with triangulated
+ surfaces. Refer to the libgts-dev package description for more
+ details.
+ .
+ This package provides runtime support for GTS
+
+Package: libgts-snapshot-doc
+Section: doc
+Architecture: all
+Conflicts: libgts-doc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GTS Library documentation (development snapshot)
+ GTS includes a number of useful functions to deal with triangulated
+ surfaces. Refer to the libgts-dev package description for more
+ details.
+ .
+ This package contains the GTS Reference, in HTML format.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..28f4856
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,4 @@
+Copyright: GNU Library General Public License, Version 2.
+
+On Debian systems, the complete text of the LGPL is located in
+/usr/share/common-licenses/LGPL-2
diff --git a/debian/libgts-snapshot-dev.install b/debian/libgts-snapshot-dev.install
new file mode 100644
index 0000000..d7bd846
--- /dev/null
+++ b/debian/libgts-snapshot-dev.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin/gts-config
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/share/aclocal
+debian/tmp/usr/share/man/man1/gts-config.1
diff --git a/debian/libgts-snapshot-doc.docs b/debian/libgts-snapshot-doc.docs
new file mode 100644
index 0000000..0bd3136
--- /dev/null
+++ b/debian/libgts-snapshot-doc.docs
@@ -0,0 +1 @@
+doc/html
diff --git a/debian/libgts-snapshot.install b/debian/libgts-snapshot.install
new file mode 100644
index 0000000..c7346f0
--- /dev/null
+++ b/debian/libgts-snapshot.install
@@ -0,0 +1,22 @@
+debian/tmp/usr/bin/gts2oogl
+debian/tmp/usr/bin/gtscheck
+debian/tmp/usr/bin/gtscompare
+debian/tmp/usr/bin/gtstemplate
+debian/tmp/usr/bin/stl2gts
+debian/tmp/usr/bin/transform
+debian/tmp/usr/bin/delaunay
+debian/tmp/usr/bin/happrox
+debian/tmp/usr/bin/gts2dxf
+debian/tmp/usr/bin/gts2stl
+debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/pkgconfig/*.pc
+debian/tmp/usr/share/man/man1/gts2oogl.1
+debian/tmp/usr/share/man/man1/gtscheck.1
+debian/tmp/usr/share/man/man1/gtscompare.1
+debian/tmp/usr/share/man/man1/gtstemplate.1
+debian/tmp/usr/share/man/man1/stl2gts.1
+debian/tmp/usr/share/man/man1/transform.1
+debian/tmp/usr/share/man/man1/delaunay.1
+debian/tmp/usr/share/man/man1/happrox.1
+debian/tmp/usr/share/man/man1/gts2dxf.1
+debian/tmp/usr/share/man/man1/gts2stl.1
diff --git a/debian/libgts-snapshot.symbols b/debian/libgts-snapshot.symbols
new file mode 100644
index 0000000..9a959a9
--- /dev/null
+++ b/debian/libgts-snapshot.symbols
@@ -0,0 +1 @@
+# dummy file just here to force dh_makeshlibs to call dpkg-gensymbols
diff --git a/debian/rules b/debian/rules
new file mode 100644
index 0000000..f9ee6ad
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+GTS_VERSION = $(shell grep -o "[0-9]*\.[0-9]*\.[0-9]*" $(CURDIR)/debian/changelog)
+DEB_DH_MAKESHLIBS_ARGS_libgts-snapshot = -- -v$(GTS_VERSION) -c0
+
+clean::
+ rm -f src/predicates_init
diff --git a/examples/happrox.c b/examples/happrox.c
index 029e11a..390c613 100644
--- a/examples/happrox.c
+++ b/examples/happrox.c
@@ -21,8 +21,12 @@
#include <stdlib.h>
#include <locale.h>
#include <string.h>
-#include <pgm.h>
#include "config.h"
+#ifdef NETPBM_INCLUDE
+# include <netpbm/pgm.h>
+#else
+# include <pgm.h>
+#endif
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif /* HAVE_GETOPT_H */
diff --git a/gts.spec.in b/gts.spec.in
deleted file mode 100644
index c7300a7..0000000
--- a/gts.spec.in
+++ /dev/null
@@ -1,75 +0,0 @@
-Summary: GNU Triangulated Surface Library (GTS)
-Name: gts
-%define version @VERSION@
-%define release 0
-%define mybuildroot /var/tmp/%{name}-build
-Version: %{version}
-Release: %{release}
-URL: http://gfs.sf.net
-License: GPL
-Source: gts-%{version}.tar.gz
-Group: Libraries/Research
-BuildRoot: %{mybuildroot}
-
-%description
-GTS stands for the GNU Triangulated Surface Library. It is an Open
-Source Free Software Library intended to provide a set of useful
-functions to deal with 3D surfaces meshed with interconnected
-triangles.
-
-A brief summary of its main features:
-
- Simple object-oriented structure giving easy access to topological properties.
- 2D dynamic Delaunay and constrained Delaunay triangulations.
- Robust geometric predicates (orientation, in circle) using fast adaptive floating point arithmetic (adapted from the fine work of Jonathan R. Shewchuk).
- Robust set operations on surfaces (union, intersection, difference).
- Surface refinement and coarsening (multiresolution models).
- Dynamic view-independent continuous level-of-detail.
- Preliminary support for view-dependent level-of-detail.
- Bounding-boxes trees and Kd-trees for efficient point location and collision/intersection detection.
- Graph operations: traversal, graph partitioning.
- Metric operations (area, volume, curvature ...).
- Triangle strips generation for fast rendering.
-
-%prep
-%setup -q -n gts-%{version}
-
-%build
-CFLAGS="$RPM_OPT_FLAGS"
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} --mandir=%{_mandir} \
- --localstatedir=%{_localstatedir} --libdir=%{_libdir} \
- --datadir=%{_datadir} --includedir=%{_includedir} \
- --sysconfdir=%{_sysconfdir}
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} \
- mandir=$RPM_BUILD_ROOT%{_mandir} libdir=$RPM_BUILD_ROOT%{_libdir} \
- localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
- datadir=$RPM_BUILD_ROOT%{_datadir} \
- includedir=$RPM_BUILD_ROOT%{_includedir} \
- sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%doc {NEWS,ChangeLog,INSTALL,README,AUTHORS,THANKS}
-/usr/bin
-/usr/lib
-/usr/include
-/usr/share/aclocal/gts.m4
-
-%changelog
-* Thu Oct 21 2004 Tim Fenn <fenn at stanford.edu>
-- Fix lack of source declaration, dual license problems
-
-* Mon Apr 26 2004 Stephane Popinet <popinet at users.sf.net>
-- Initial build.
diff --git a/src/misc.c b/src/misc.c
index 31142a8..7194d10 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -528,8 +528,36 @@ GtsFileVariable * gts_file_assign_next (GtsFile * f, GtsFileVariable * vars)
gts_file_error (f, "expecting a string");
var->set = FALSE;
}
- else if (var->data)
- *((gchar **) var->data) = g_strdup (f->token->str);
+ else {
+ if (f->token->str[0] != '"') { /* simple string */
+ if (var->data)
+ *((gchar **) var->data) = g_strdup (f->token->str);
+ }
+ else {
+ /* quoted string */
+ gint len = strlen (f->token->str);
+ if (f->token->str[len - 1] == '"') {
+ /* simple quoted string */
+ f->token->str[len - 1] = '\0';
+ if (var->data)
+ *((gchar **) var->data) = g_strdup (&(f->token->str[1]));
+ f->token->str[len - 1] = '"';
+ }
+ else {
+ /* multiple parts */
+ GString * s = g_string_new (&(f->token->str[1]));
+ g_string_append_c (s, ' ');
+ int c = gts_file_getc (f);
+ while (c != '"' && c != EOF) {
+ g_string_append_c (s, c);
+ c = gts_file_getc (f);
+ }
+ if (var->data)
+ *((gchar **) var->data) = g_strdup (s->str);
+ g_string_free (s, TRUE);
+ }
+ }
+ }
break;
default:
g_assert_not_reached ();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gts.git
More information about the debian-science-commits
mailing list