Commit affa66f7 authored by Barak A. Pearlmutter's avatar Barak A. Pearlmutter

Import Upstream version 0.4.5

parent 227bd55b
- Denis Auroux (auroux@math.mit.edu)
- various patch contributors as noted in the ChangeLog
Main author: Denis Auroux (auroux@math.mit.edu, auroux@math.berkeley.edu)
The source code includes contributions by the following people:
Eduardo de Barros Lima, Mathieu Bouchard, Ole Joergen Broenner,
Vincenzo Ciancia, Luca de Cicco, Michele Codutti, Robert Gerlach,
Lukasz Kaiser, Danny Kukawka, Bob McElrath, Andy Neitzke,
David Planella, Alex Ray, Jean-Baptiste Rouquier, Mike Ter Louw,
Uwe Winter, Lu Zhihe.
(Let me know if you are missing from this list or if your name is
mis-spelled)
Version 0.4.5 (Oct 2, 2009):
- bugfixes for GTK+ 2.16/2.17 issues with xinput events
- various minor UI bugfixes
- gettext internationalization (contributed by David Planella)
- Catalan translation (by David Planella), French translation
- use poppler instead of pdftoppm to render PDF backgrounds
(after patches by Mike Ter Louw and Bob McElrath)
- various improvements to UI and to key bindings (including
patches by Bob McElrath and Lu Zhihe)
- use gtk-print instead of libgnomeprint for printing
- custom color chooser (patch contributed by Alex Ray)
- option to have tablet buttons toggle the mapping rather than draw
- paper color chooser (after a patch by Ole Joergen Broenner)
- remove binary installer (due to binary incompatibilities)
- UPDATED DEPENDENCIES: need gtk+ 2.10, poppler-glib 0.5.4
Version 0.4.2.1 (Mar 27, 2008):
- bugfix for #1926757 (crash upon pasting variable-width stroke)
- bugfix: set ruler/recognizer setting to default upon switching tools
......
Xournal Installation instructions
=================================
Binary installer:
-----------------
The tarball includes an executable file for Linux IA32. If your setup
is sufficiently standard, you might be able to use the binary installer
script, "install-binary".
Either run this script as root, to install xournal in /usr/local/bin
(and the dependencies in /usr/local/share/xournal), or as any user, to
install xournal in your home directory.
You will still need to have gtk+ 2.4 or later and the other required
libraries installed on your system (see below).
Otherwise, read on for compilation and installation instructions.
Dependencies:
-------------
......@@ -26,25 +9,24 @@ Required packages and libraries:
* TO COMPILE xournal:
- autoconf, automake (to generate the makefiles)
- gtk+ 2.4 or later development packages (2.6 recommended)
- gtk+ 2.10 or later development packages
(package gtk2-devel and its dependencies)
- libgnomecanvas 2.4 or later development packages
(package libgnomecanvas-devel and its dependencies)
- libgnomeprint and libgnomeprintui 2.2 development packages
(packages libgnomeprint22-devel, libgnomeprintui22-devel, and dependencies)
- poppler-glib 0.5.4 or later development packages
(package poppler-glib-devel and dependencies)
* TO RUN xournal:
- gtk+ 2.4 or later (2.6 recommended)
- gtk+ 2.10 or later
(package gtk2 and dependencies)
- libgnomecanvas 2.4 or later
(package libgnomecanvas and dependencies)
- libgnomeprint and libgnomeprintui 2.2 or later
(packages libgnomeprint22, libgnomeprintui22, and dependencies)
- poppler-glib 0.5.4 or later
(package poppler-glib and dependencies)
* OTHER:
- xpdf (more precisely, pdftoppm) is required for PDF file annotation
- ghostscript (optional: used to import PS/PDF files as bitmap backgrounds)
......@@ -53,14 +35,13 @@ Compilation and installation:
Installation in /usr/local:
./autogen.sh
./configure
make
(as root) make install
(as root) make desktop-install
Installation in $HOME:
./autogen.sh
./configure --prefix=$HOME
make
make install
......
## Process this file with automake to produce Makefile.in
SUBDIRS = src
SUBDIRS = src po
EXTRA_DIST = \
autogen.sh \
......
This diff is collapsed.
Version 0.4.2.1 (March 27, 2008)
Version 0.4.5 (October 2, 2009)
Installation: see INSTALL
User's manual: see html-doc/manual.html
Updates: see http://xournal.sourceforge.net/
or http://math.mit.edu/~auroux/software/xournal/
See also: http://sourceforge.net/projects/xournal
Version 0.4.2.1 (March 27, 2008)
Version 0.4.5 (October 2, 2009)
Installation: see INSTALL
User's manual: see html-doc/manual.html
Updates: see http://xournal.sourceforge.net/
or http://math.mit.edu/~auroux/software/xournal/
Installation: see INSTALL
Latest changes: see ChangeLog
User's manual: see html-doc/manual.html
Updates: see http://xournal.sourceforge.net/
See also: http://sourceforge.net/projects/xournal
This diff is collapsed.
/* config.h.in. Generated from configure.in by autoheader. */
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
/* Gettext package. */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(xournal, 0.4.2.1)
AM_INIT_AUTOMAKE(xournal, 0.4.5)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
AC_ISC_POSIX
AC_PROG_CC
AM_PROG_CC_STDC
AC_PROG_RANLIB
AC_HEADER_STDC
pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
GETTEXT_PACKAGE=xournal
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
dnl Add the languages which your application supports here.
ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
AM_GLIB_GNU_GETTEXT
AC_OUTPUT([
Makefile
src/Makefile
src/ttsubset/Makefile
po/Makefile.in
])
This diff is collapsed.
This diff is collapsed.
../pixmaps
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
if test `id -u` = 0; then
echo "This installer will now attempt to install the 'xournal' binary in"
echo "/usr/local/bin and the support files in /usr/local/share/xournal."
echo "Press Control-C to abort, or Enter to proceed."
read
echo "Installing xournal in /usr/local/bin..."
test -z /usr/local/bin || mkdir -p /usr/local/bin
install -c src/xournal /usr/local/bin/xournal
echo "Installing pixmaps in /usr/local/share/xournal/pixmaps..."
install -d /usr/local/share/xournal/pixmaps
for pixmap in pixmaps/*; do
install -c -m 644 $pixmap /usr/local/share/xournal/pixmaps
done
echo "Installing html-doc in /usr/local/share/xournal/html-doc..."
install -d /usr/local/share/xournal/html-doc
for docfile in html-doc/*; do
if test -f $docfile; then
install -c -m 644 $docfile /usr/local/share/xournal/html-doc
fi
done
if test ! -e /usr/local/share/xournal/html-doc/pixmaps; then
ln -s ../pixmaps /usr/local/share/xournal/html-doc/pixmaps
fi
echo "Installing desktop files and MIME info in /usr/local/share and /usr/share/mimelnk..."
install -d /usr/local/share/icons/hicolor/scalable/apps
install -d /usr/local/share/icons/hicolor/scalable/mimetypes
install -d /usr/share/mimelnk/application
install -d /usr/local/share/mime/packages
install -d /usr/local/share/applications
install -c -m 644 pixmaps/xournal.svg /usr/local/share/icons/hicolor/scalable/apps
install -c -m 644 pixmaps/xoj.svg /usr/local/share/icons/hicolor/scalable/mimetypes
if test ! -e /usr/local/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then
ln -s xoj.svg /usr/local/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
fi
install -c -m 644 x-xoj.desktop /usr/share/mimelnk/application
install -c -m 644 xournal.xml /usr/local/share/mime/packages
install -c -m 644 xournal.desktop /usr/local/share/applications
update-desktop-database
update-mime-database /usr/local/share/mime
gtk-update-icon-cache -f -t /usr/local/share/icons/hicolor
else
echo "To install xournal in /usr/local, you must run this installer as root."
echo "This installer will now attempt to install xournal in your home directory."
echo "Press Control-C to abort, or select a directory for the installation"
echo "(the binary will be installed in this location, and the support files will"
echo "be installed into subdirectories called pixmaps/ and html-doc/)."
echo
echo -n "Location [default: $HOME/bin]: "
read location
if test -z $location; then
location=$HOME/bin
fi
echo "Installing xournal in $location..."
test -z $location || mkdir -p $location
install -c src/xournal $location/xournal
echo "Installing pixmaps in $location/pixmaps..."
install -d $location/pixmaps
for pixmap in pixmaps/*; do
install -c -m 644 $pixmap $location/pixmaps
done
echo "Installing html-doc in $location/html-doc..."
install -d $location/html-doc
for docfile in html-doc/*; do
if test -f $docfile; then
install -c -m 644 $docfile $location/html-doc
fi
done
if test ! -e $location/html-doc/pixmaps; then
ln -s ../pixmaps $location/html-doc/pixmaps
fi
echo "Installing desktop files and MIME info in $HOME/.local..."
install -d $HOME/.local/share/icons/hicolor/scalable/apps
install -d $HOME/.local/share/icons/hicolor/scalable/mimetypes
install -d $HOME/.kde/share/mimelnk/application
install -d $HOME/.local/share/mime/packages
install -d $HOME/.local/share/applications
install -c -m 644 pixmaps/xournal.svg $HOME/.local/share/icons/hicolor/scalable/apps
install -c -m 644 pixmaps/xoj.svg $HOME/.local/share/icons/hicolor/scalable/mimetypes
if test ! -e $HOME/.local/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then
ln -s xoj.svg $HOME/.local/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
fi
install -c -m 644 x-xoj.desktop $HOME/.kde/share/mimelnk/application
install -c -m 644 xournal.xml $HOME/.local/share/mime/packages
install -c -m 644 xournal.desktop $HOME/.local/share/applications
XDG_DATA_DIRS=$HOME/.local/share update-desktop-database
update-mime-database $HOME/.local/share/mime
gtk-update-icon-cache -f -t $HOME/.local/share/icons/hicolor
fi
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Version 0.4.5:
- added Catalan translation (by David Planella)
- added French translation
This diff is collapsed.
This diff is collapsed.
File added
This diff is collapsed.
File added
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment