Skip to content

Commit

Permalink
2007-10-15 Daniel Leidert <daniel.leidert.spam@gmx.net>
Browse files Browse the repository at this point in the history
	* Makefile.am (MAINTAINERCLEANFILES): Remove gnome-doc-utils.make on
	maintainer-clean.
	(DISTCHECK_CONFIGURE_FLAGS): Disable schemas installation for
	distcheck target.
	* configure.ac: Fix broken output indentation.
	* gcu.pc.in: Added URL field. Fixed goffice package name.
	* gcu-unstable.pc.in: Ditto.
	* docs/man/Makefile.am: Formatting changes. Backported the better
	version of the 0.8 series. Added new manpages and their sources (all
	sources have been renamed!). Removed GNU make extensions usage.
	* docs/man/gcu_entities.dtd.in: Added an prefix to easily switch
	between stable and development version manpages. Added a central
	copyright/legalnotice note.
	* gcu_man_legal.xml: Added.
	* gchem3d-viewer.1.xml: Updated. Renamed to
	gchem3d-viewer-unstable.1.xml.
	* gchemcalc.1.xml: Ditto. Renamed to gchemcalc-unstable.1.xml.
	* gchemtable.1.xml: Ditto. Renamed to gchemtable-unstable.1.xml.
	* libgcu.3.xml: Ditto. Renamed to libgcu-unstable.3.xml.
	* gchem3d-viewer.1: Ditto. Renamed to gchem3d-viewer-unstable.1.
	* gchemcalc.1: Ditto. Renamed to gchemcalc-unstable.1
	* gchemtable.1: Ditto. Renamed to gchemtable-unstable.1.
	* libgcu.3: Ditto. Renamed to libgcu-unstable.3.
	* gchempaint-unstable.1.xml: Added.
	* gcrystal-unstable.1.xml: Ditto.
	* gspectrum-unstable.1.xml: Ditto.
	* gchempaint-unstable.1: Ditto.
	* gcrystal-unstable.1: Ditto.
	* gspectrum-unstable.1: Ditto.
	* docs/reference/Makefile.am: Backported from 0.8 series. Removed GNU
	make extensions usage.
	* plugins/paint/arrows/Makefile.am: Backported cleaner version from
	0.8 series. Formatting fixes. Fixed install-data-local and added
	missing uninstall-local targets for schemas installation.
	* plugins/paint/atoms/Makefile.am: Ditto.
	* plugins/paint/bonds/Makefile.am: Ditto.
	* plugins/paint/cycles/Makefile.am: Ditto.
	* plugins/paint/residues/Makefile.am: Ditto.
	* plugins/paint/selection/Makefile.am: Ditto.
	* plugins/paint/templates/Makefile.am: Ditto.
	* plugins/paint/wikipedia/Makefile.am: Ditto.
	* plugins/paint/text/Makefile.am: Ditto.
	(gladedir): Fixed location.
	* database/Makefile.am: Inner formatting changes. Drop EXTRA_DIST in
	favour of dist_ suffixes. Used alphabetical ordering.
	* glade/Makefile.am: Ditto.
	* glade/crystal/Makefile.am: Ditto.
	* glade/paint/Makefile.am: Ditto.
	* glade/table/Makefile.am: Ditto.
	* pixmaps/Makefile.am: Ditto.
	* plugins/paint/Makefile.am: Ditto.
	* programs/3d/Makefile.am: Ditto.
	* programs/calc/Makefile.am: Ditto.
	* programs/spectra/Makefile.am: Ditto.
	* programs/table/Makefile.am: Ditto.
	* themes/paint/Makefile.am: Ditto.
	* goffice/Makefile.am: Ditto. Further added MAINTAINERCLEANFILES to
	remove the created Makefile.in.
	* programs/crystal/Makefile.am: Ditto.
	(schemasdir): Don't ignore GCONF_SCHEMA_FILE_DIR.
	* programs/paint/Makefile.am: Likewise. Added missing
	install-data-local and uninstall-local targets for the schemas
	installation.
	* plugins/Makefile.am: Added MAINTAINERCLEANFILES to remove the
	created Makefile.in.
	* templates/Makefile.am: Ditto.
	* templates/paint/Makefile.am: (xmldir): Fixed installation location.
	* po/POTFILES.in: Added missing files to make intltool happy.
	* programs/3d/gchem3d-viewer-unstable.desktop.in: Make it compliant to
	the latest specification 1.0 of the desktop entry spec. Declare this
	version compliancy via the Version key.
	* programs/3d/gchem3d-viewer.desktop.in: Ditto.
	* programs/calc/gchemcalc-unstable.desktop.in: Ditto.
	* programs/calc/gchemcalc.desktop.in: Ditto.
	* programs/crystal/gcrystal-unstable.desktop.in: Ditto.
	* programs/crystal/gcrystal.desktop.in: Ditto.
	* programs/paint/gchempaint-unstable.desktop.in: Ditto.
	* programs/paint/gchempaint.desktop.in: Ditto.
	* programs/table/gchemtable-unstable.desktop.in: Ditto.
	* programs/table/gchemtable.desktop.in: Ditto.
	* programs/spectra/gspectrum-unstable.desktop.in: Ditto.
	(MimeType): Fixed (must end with semicolon).
	* programs/spectra/gspectrum.desktop.in: Likewise.
  • Loading branch information
dleidert committed Oct 16, 2007
1 parent 88a8d98 commit 10ef561
Show file tree
Hide file tree
Showing 67 changed files with 1,519 additions and 760 deletions.
85 changes: 85 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,90 @@
##Text encoding: utf-8

2007-10-15 Daniel Leidert <daniel.leidert.spam@gmx.net>
* Makefile.am (MAINTAINERCLEANFILES): Remove gnome-doc-utils.make on
maintainer-clean.
(DISTCHECK_CONFIGURE_FLAGS): Disable schemas installation for
distcheck target.
* configure.ac: Fix broken output indentation.
* gcu.pc.in: Added URL field. Fixed goffice package name.
* gcu-unstable.pc.in: Ditto.
* docs/man/Makefile.am: Formatting changes. Backported the better
version of the 0.8 series. Added new manpages and their sources (all
sources have been renamed!). Removed GNU make extensions usage.
* docs/man/gcu_entities.dtd.in: Added an prefix to easily switch
between stable and development version manpages. Added a central
copyright/legalnotice note.
* gcu_man_legal.xml: Added.
* gchem3d-viewer.1.xml: Updated. Renamed to
gchem3d-viewer-unstable.1.xml.
* gchemcalc.1.xml: Ditto. Renamed to gchemcalc-unstable.1.xml.
* gchemtable.1.xml: Ditto. Renamed to gchemtable-unstable.1.xml.
* libgcu.3.xml: Ditto. Renamed to libgcu-unstable.3.xml.
* gchem3d-viewer.1: Ditto. Renamed to gchem3d-viewer-unstable.1.
* gchemcalc.1: Ditto. Renamed to gchemcalc-unstable.1
* gchemtable.1: Ditto. Renamed to gchemtable-unstable.1.
* libgcu.3: Ditto. Renamed to libgcu-unstable.3.
* gchempaint-unstable.1.xml: Added.
* gcrystal-unstable.1.xml: Ditto.
* gspectrum-unstable.1.xml: Ditto.
* gchempaint-unstable.1: Ditto.
* gcrystal-unstable.1: Ditto.
* gspectrum-unstable.1: Ditto.
* docs/reference/Makefile.am: Backported from 0.8 series. Removed GNU
make extensions usage.
* plugins/paint/arrows/Makefile.am: Backported cleaner version from
0.8 series. Formatting fixes. Fixed install-data-local and added
missing uninstall-local targets for schemas installation.
* plugins/paint/atoms/Makefile.am: Ditto.
* plugins/paint/bonds/Makefile.am: Ditto.
* plugins/paint/cycles/Makefile.am: Ditto.
* plugins/paint/residues/Makefile.am: Ditto.
* plugins/paint/selection/Makefile.am: Ditto.
* plugins/paint/templates/Makefile.am: Ditto.
* plugins/paint/wikipedia/Makefile.am: Ditto.
* plugins/paint/text/Makefile.am: Ditto.
(gladedir): Fixed location.
* database/Makefile.am: Inner formatting changes. Drop EXTRA_DIST in
favour of dist_ suffixes. Used alphabetical ordering.
* glade/Makefile.am: Ditto.
* glade/crystal/Makefile.am: Ditto.
* glade/paint/Makefile.am: Ditto.
* glade/table/Makefile.am: Ditto.
* pixmaps/Makefile.am: Ditto.
* plugins/paint/Makefile.am: Ditto.
* programs/3d/Makefile.am: Ditto.
* programs/calc/Makefile.am: Ditto.
* programs/spectra/Makefile.am: Ditto.
* programs/table/Makefile.am: Ditto.
* themes/paint/Makefile.am: Ditto.
* goffice/Makefile.am: Ditto. Further added MAINTAINERCLEANFILES to
remove the created Makefile.in.
* programs/crystal/Makefile.am: Ditto.
(schemasdir): Don't ignore GCONF_SCHEMA_FILE_DIR.
* programs/paint/Makefile.am: Likewise. Added missing
install-data-local and uninstall-local targets for the schemas
installation.
* plugins/Makefile.am: Added MAINTAINERCLEANFILES to remove the
created Makefile.in.
* templates/Makefile.am: Ditto.
* templates/paint/Makefile.am: (xmldir): Fixed installation location.
* po/POTFILES.in: Added missing files to make intltool happy.
* programs/3d/gchem3d-viewer-unstable.desktop.in: Make it compliant to
the latest specification 1.0 of the desktop entry spec. Declare this
version compliancy via the Version key.
* programs/3d/gchem3d-viewer.desktop.in: Ditto.
* programs/calc/gchemcalc-unstable.desktop.in: Ditto.
* programs/calc/gchemcalc.desktop.in: Ditto.
* programs/crystal/gcrystal-unstable.desktop.in: Ditto.
* programs/crystal/gcrystal.desktop.in: Ditto.
* programs/paint/gchempaint-unstable.desktop.in: Ditto.
* programs/paint/gchempaint.desktop.in: Ditto.
* programs/table/gchemtable-unstable.desktop.in: Ditto.
* programs/table/gchemtable.desktop.in: Ditto.
* programs/spectra/gspectrum-unstable.desktop.in: Ditto.
(MimeType): Fixed (must end with semicolon).
* programs/spectra/gspectrum.desktop.in: Likewise.

2007-10-08 Jean Bréfort <jean.brefort@normalesup.org>
* libs/gcu/formula.cc: initial work to parse formulas with residues.
* libs/gcu/residue.cc: add gcu::Residue::MaxSymbolLength.
Expand Down
18 changes: 9 additions & 9 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
SUBDIRS = po database glade pixmaps libs plugins programs mozilla-plugin \
goffice templates themes samples tests dtds docs

EXTRA_DIST= \
$(mime_in_files) \
intltool-extract.in \
intltool-update.in \
intltool-merge.in \
gnome-doc-utils.make \
EXTRA_DIST= \
$(mime_in_files) \
intltool-extract.in \
intltool-update.in \
intltool-merge.in \
gnome-doc-utils.make \
COPYING-DOCS

CLEANFILES = \
Expand All @@ -25,6 +25,7 @@ MAINTAINERCLEANFILES = \
config.h.in \
configure \
depcomp \
gnome-doc-utils.make \
install-sh \
intltool-extract.in \
intltool-merge.in \
Expand All @@ -36,11 +37,13 @@ MAINTAINERCLEANFILES = \

DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
--disable-schemas-install \
--disable-update-databases \
--with-mozilla-libdir=\$${libdir}/mozilla \
--with-goffice-plugins-dir=\$${libdir}/goffice

mime_in_files = gchemutils.xml.in

mimedir = $(datadir)/mime/packages
mime_DATA = $(mime_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
Expand All @@ -60,6 +63,3 @@ endif #WITH_UPDATE_MIME
if WITH_UPDATE_DESKTOP
$(UPDATE_DESKTOP_DATABASE) $(datadir)/applications
endif #WITH_UPDATE_DESKTOP

distcleancheck_listfiles = \
find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
25 changes: 10 additions & 15 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,15 @@ GETTEXT_PACKAGE="gchemutils-unstable"
AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Package name for internationalization])

AC_ARG_ENABLE([update-databases],
[
AC_HELP_STRING(
AC_ARG_ENABLE(
[update-databases],
AC_HELP_STRING(
[--enable-update-databases],
[
enable (or disable) the running of the update-desktop-database and update-mime-database
utilities (mostly useful for package maintainers) @<:@default=yes@:>@
]
)
],
),
[
if test "x$enableval" != "xno"; then
AC_PATH_PROG([UPDATE_DESKTOP_DATABASE], [update-desktop-database], [no])
Expand Down Expand Up @@ -134,10 +133,10 @@ AC_SUBST([GCU_LIBS])
GOFFICE_PLUGINS_DIR=`pkg-config --variable=GOffice_plugins_dir libgoffice-0.4`
AC_ARG_WITH(
[goffice-plugins-dir],
[AC_HELP_STRING(
AC_HELP_STRING(
[--with-goffice-plugins-dir],
[path to GOffice plugins directory [default=auto]]
)],
),
[GOFFICE_PLUGINS_DIR=$withval]
)

Expand All @@ -164,12 +163,10 @@ build_mozilla_plugin=no
test_mozilla_plugin=true
AC_ARG_ENABLE(
[mozilla-plugin],
[
AC_HELP_STRING(
AC_HELP_STRING(
[--enable-mozilla-plugin],
[build a Mozilla/Firefox chemistry files viewing plugin @<:@default=auto@:>@]
)
],
),
[test_mozilla_plugin="$enableval"]
)

Expand Down Expand Up @@ -198,12 +195,10 @@ fi

AC_ARG_WITH(
[mozilla-libdir],
[
AC_HELP_STRING(
AC_HELP_STRING(
[--with-mozilla-libdir],
[path to mozilla/firefox/... libdir @<:@default=auto@:>@]
)
],
),
[mozlibdir=$withval]
)

Expand Down
6 changes: 2 additions & 4 deletions database/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in

EXTRA_DIST = $(xml_in_files)

CLEANFILES = $(xml_DATA)

xmldir = $(datadir)/gchemutils-unstable
MAINTAINERCLEANFILES = Makefile.in

xml_in_files = \
elements.xml.in \
Expand All @@ -13,6 +11,6 @@ xml_in_files = \
radii.xml.in \
residues.xml.in

xmldir = $(datadir)/gchemutils-unstable
xml_DATA = $(xml_in_files:.xml.in=.xml)

@INTLTOOL_XML_RULE@
51 changes: 33 additions & 18 deletions docs/man/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,46 +1,61 @@
EXTRA_DIST = \
gcu_entities.dtd.in \
gcu_man_legal.xml \
$(gcu_man_src) \
$(man1_MANS) \
$(man3_MANS)
$(man_MANS)

DISTCLEAN = gcu_entities.dtd

MAINTAINERCLEANFILES = Makefile.in

XMLLINT_FLAGS += --path "$(VPATH)" --noout --valid
XSLTPROC_FLAGS += --path "$(VPATH)" --param man.charmap.use.subset "0"
XSLTPROC_FLAGS += --path "$(VPATH)" \
--param man.charmap.use.subset "0" \
--param make.year.ranges "1" \
--param make.single.year.ranges "1"

VPATH += @builddir@

gcu_man_src = \
gchem3d-viewer.1.xml \
gchemcalc.1.xml \
gchemtable.1.xml \
libgcu.3.xml

man1_MANS = $(patsubst %.1.xml,%.1,$(filter %.1.xml,$(gcu_man_src)))
man3_MANS = $(patsubst %.3.xml,%.3,$(filter %.3.xml,$(gcu_man_src)))


% : %.xml
gchem3d-viewer-unstable.1.xml \
gchemcalc-unstable.1.xml \
gchempaint-unstable.1.xml \
gchemtable-unstable.1.xml \
gcrystal-unstable.1.xml \
gspectrum-unstable.1.xml \
libgcu-unstable.3.xml

man_MANS = \
gchem3d-viewer-unstable.1 \
gchemcalc-unstable.1 \
gchempaint-unstable.1 \
gchemtable-unstable.1 \
gcrystal-unstable.1 \
gspectrum-unstable.1 \
libgcu-unstable.3

SUFFIXES = .xml

.xml:
if HAVE_XSLTPROC
$(XSLTPROC) $(XSLTPROC_FLAGS) $<
else
$(warning "Cannot update the XML sources without `xsltproc'.")
echo "***** Cannot update the XML sources without `xsltproc'."
endif


check-local:
$(info "Correct any errors before making a distribution.")
@echo "***** Correct any errors before making a distribution."
if HAVE_XMLLINT
$(XMLLINT) $(XMLLINT_FLAGS) $(gcu_man_src)
else
$(warning "Cannot check the XML sources without `xmllint'.")
@echo "***** Cannot check the XML sources without `xmllint'."
endif
if HAVE_MAN
LANG=C MANWIDTH=80 $(MAN) $(addprefix $(srcdir)/,$(man1_MANS) $(man3_MANS)) > /dev/null
@for man in $(man_MANS) ; do \
LANG=C MANWIDTH=80 $(MAN) $(srcdir)/$${man} > /dev/null ; \
done
else
$(warning "Cannot check the manpages without `man'.")
@echo "***** Cannot check the manpages without `man'."
endif

81 changes: 81 additions & 0 deletions docs/man/gchem3d-viewer-unstable.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
.\" Title: gchem3d-viewer-unstable
.\" Author: Jean Br\('efort <jean.brefort@normalesup.org>
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
.\" Date: $Date: 2007-10-16 01:11:41 $
.\" Manual: gnome-chemistry-utils
.\" Source: gcu 0.9.2
.\"
.TH "GCHEM3D\-VIEWER\-UNS" "1" "$Date: 2007-10-16 01:11:41 $" "gcu 0.9.2" "gnome-chemistry-utils"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
gchem3d-viewer-unstable - a small chemical viewer application
.SH "SYNOPSIS"
.HP 24
\fBgchem3d\-viewer\-unstable\fR [\fBOPTION(S)\fR...] [\fIFILE\fR]
.SH "DESCRIPTION"
.PP
\fBgchem3d\-viewer\-unstable\fR
is a small chemical viewer application, which can show several chemical file formats\.
.SH "OPTIONS"
.PP
The following options are accepted:
.PP
\fB\-b \fR\fB\fICOLOR\fR\fR, \fB\-\-bgcolor=\fR\fB\fICOLOR\fR\fR
.RS 4
Use the given color as background color\.
\fICOLOR\fR
can be one of
"\fIblack\fR" (default), "\fIwhite\fR", "\fI#rrggbb\fR" (don\'t forget to escape the \(lq#\(rq character in the shell)\.
.RE
.PP
\fB\-d \fR\fB\fIMODEL\fR\fR, \fB\-\-display3d=\fR\fB\fIMODEL\fR\fR
.RS 4
Choose how molecules are displayed\.
\fIMODEL\fR
can be one of
"\fIBallnStick\fR" (default), "\fISpaceFill\fR"\.
.RE
.PP
\fB\-?\fR, \fB\-\-help\fR
.RS 4
Show application help options\.
.RE
.PP
\fB\-\-help\-all\fR, \fB\-\-help\-*\fR
.RS 4
Print all or just a group of help options\. These options are not documented here\. Instead see
\fBgtk-options\fR(7)
and
\fBgnome-options\fR(7)\.
.RE
.PP
\fB\-v\fR, \fB\-\-version\fR
.RS 4
Print gchem3d\-viewer\-unstable version information\.
.RE
.SH "SEE ALSO"
.PP
\fBgnome-options\fR(7),
\fBgtk-options\fR(7)
.SH "AUTHORS"
.PP
\fBJean Br\('efort\fR <\&jean\.brefort@normalesup\.org\&>
.sp -1n
.IP "" 4
Program author\.
.PP
\fBDaniel Leidert\fR <\&daniel\.leidert@wgdd\.de\&>
.sp -1n
.IP "" 4
Manpage author\.
.SH "COPYRIGHT"
Copyright \(co 2002-2007 Jean Br\('efort
.br
Copyright \(co 2004-2007 Daniel Leidert
.br
.PP
Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation\.
.sp
Loading

0 comments on commit 10ef561

Please sign in to comment.