Commit b164ef51 authored by Carlo Segre's avatar Carlo Segre Committed by Barak A. Pearlmutter

Import Debian changes 0.4.2.1-1

xournal (0.4.2.1-1) unstable; urgency=low

  * Changing Maintainer
  * Changed dependency from gs to ghostscript-x.
  * Converted to quilt for source modifications.
  * Restored UTF support in desktop and mime files.
  * Modify clean rule to delete leftover configuration files which 
    were making the diff.gz file significantly larger.
  * Added patch to src/xo-file.c which fixes the problem that PDF files 
    cannot be opened for annotation with libgtk2.0-0 version 2.14.7 on 
    i386 (Closes: #522541).
  * Install debian/watch from Ubuntu package (Closes: #501323).
  * Raised debhelper compatibility  level to 7.
  * Upgraded Standards Version to 3.8.1 (no changes).
  * Acknowledge NMU (Closes: #478540).
parent 6abfba66
This diff is collapsed.
This diff is collapsed.
/* config.h.in. Generated from configure.in by autoheader. */
/* 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
xournal (0.4.2.1-1) unstable; urgency=low
* Changing Maintainer
* Changed dependency from gs to ghostscript-x.
* Converted to quilt for source modifications.
* Restored UTF support in desktop and mime files.
* Modify clean rule to delete leftover configuration files which
were making the diff.gz file significantly larger.
* Added patch to src/xo-file.c which fixes the problem that PDF files
cannot be opened for annotation with libgtk2.0-0 version 2.14.7 on
i386 (Closes: #522541).
* Install debian/watch from Ubuntu package (Closes: #501323).
* Raised debhelper compatibility level to 7.
* Upgraded Standards Version to 3.8.1 (no changes).
* Acknowledge NMU (Closes: #478540).
-- Carlo Segre <segre@debian.org> Thu, 09 Apr 2009 00:16:08 -0500
xournal (0.4.2.1-0.1) unstable; urgency=low
* Non-maintainer upload.
......
Source: xournal
Section: utils
Priority: optional
Maintainer: Mathieu Bouchard <mbouchar@bioinfo.ulaval.ca>
Build-Depends: debhelper (>= 5), autoconf, automake, libgtk2.0-dev (>= 2.4), libgnomecanvas2-dev, libgnomeprint2.2-dev, libgnomeprintui2.2-dev
Standards-Version: 3.7.3
Maintainer: Carlo Segre <segre@debian.org>
Build-Depends: debhelper (>= 7), autoconf, automake, quilt,
libgtk2.0-dev (>= 2.4), libgnomecanvas2-dev, libgnomeprint2.2-dev,
libgnomeprintui2.2-dev
Standards-Version: 3.8.1
Homepage: http://xournal.sourceforge.net/
Package: xournal
Architecture: any
Depends: ${shlibs:Depends}, gs, poppler-utils
Depends: ${shlibs:Depends}, ghostscript-x, poppler-utils
Description: GTK+ Application for note taking
Xournal is a GTK+ application for notetaking, sketching and
keeping a journal using a stylus. It can also be used to
......
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,4 +19,4 @@
xo-shapes.c xo-shapes.h
xournal_LDADD = @PACKAGE_LIBS@
-
+xournal_LDFLAGS = -Wl,--as-needed
--- a/src/xo-file.c
+++ b/src/xo-file.c
@@ -987,7 +987,18 @@
for (npad = 6; npad>0; npad--) {
ppm_name = g_strdup_printf("%s/p-%0*d.ppm", bgpdf.tmpdir, npad, req->pageno);
if (bgpdf.status != STATUS_ABORTED && bgpdf.status != STATUS_SHUTDOWN)
- pixbuf = gdk_pixbuf_new_from_file(ppm_name, NULL);
+ { // workaround for PPM loading issue in recent GTK
+ gchar *buf;
+ gsize count;
+ GdkPixbufLoader *loader = gdk_pixbuf_loader_new_with_type("pnm", NULL);
+ if (loader!=NULL && g_file_get_contents(ppm_name, &buf, &count, NULL))
+ {
+ gdk_pixbuf_loader_write(loader, buf, count, NULL);
+ pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+ gdk_pixbuf_loader_close(loader, NULL);
+ g_free(buf);
+ }
+ }
ret = unlink(ppm_name);
g_free(ppm_name);
if (pixbuf != NULL || ret == 0) break;
add_ldflags
correct_gtk_usage
......@@ -9,6 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
......@@ -18,9 +20,9 @@ else
endif
configure: configure-stamp
configure-stamp:
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add here commands to configure the package.
# Configure the package.
./autogen.sh --prefix=/usr
touch configure-stamp
......@@ -29,22 +31,23 @@ build: build-stamp
build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
# Compile the package.
$(MAKE)
touch build-stamp
clean:
clean: unpatch
dh_testdir
dh_testroot
# Add here commands to clean up after the build process.
# Clean up after the build process.
if test -f Makefile; then \
$(MAKE) distclean; \
else \
rm -f src/xournal; \
fi
rm -f aclocal.m4 config.h.in Makefile.in src/Makefile.in
rm -f configure-stamp build-stamp
rm -f depcomp install-sh missing configure
......@@ -53,10 +56,10 @@ clean:
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_prep
dh_installdirs
# Add here commands to install the package into debian/xournal.
# Install the package into debian/xournal.
$(MAKE) install DESTDIR=$(CURDIR)/debian/xournal
$(MAKE) desktop-install DESTDIR=$(CURDIR)/debian/xournal
......
version=3
http://sf.net/xournal/xournal-(.*)\.tar\.gz
.\" Hey, EMACS: -*- nroff -*-
.TH XOURNAL 1 "January 10, 2007"
.TH XOURNAL 1 "April 9, 2009"
.SH NAME
xournal \- GTK+ Application for note taking
.SH SYNOPSIS
......@@ -7,17 +7,19 @@ xournal \- GTK+ Application for note taking
.RI [ file ]
.br
.SH DESCRIPTION
This manual page documents briefly the
This manual page briefly documents the
.B xournal
command.
.PP
\fBXournal\fP is a GTK+ application for notetaking, sketching and
keeping a journal using a stylus. It can also be used to
add annotations to PDF files.
.SH OPTIONS
Xournal doesn't take any options.
add annotations to PDF files and graphics files. It takes no options.
.PP
The Xournal HTML manual may be found at
file://usr/share/xournal/html-doc/manual.html
.SH AUTHOR
xournal was written by Denis Auroux <auroux@math.mit.edu>.
.PP
This manual page was written by Mathieu Bouchard <mbouchar@bioinfo.ulaval.ca>,
This manual page was originally written by
Mathieu Bouchard <mbouchar@bioinfo.ulaval.ca>,
for the Debian project (but may be used by others).
......@@ -19,4 +19,4 @@ xournal_SOURCES = \
xo-shapes.c xo-shapes.h
xournal_LDADD = @PACKAGE_LIBS@
xournal_LDFLAGS = -Wl,--as-needed
This diff is collapsed.
[Desktop Entry]
Encoding=UTF-8
Type=MimeType
MimeType=application/x-xoj
Icon=xoj
......
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Xournal
......
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