--- epdfview-0.1.7.orig/autogen.sh +++ epdfview-0.1.7/autogen.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Script to generate all required files for `configure' when +# starting from a fresh repository checkout. + +ACLOCAL="aclocal -I m4" +AUTOCONF="autoconf" +AUTOHEADER="autoheader" +LIBTOOLIZE="libtoolize --automake" +AUTOMAKE="automake -a -c --foreign" + +build () { + echo -n "Building '$1'... " + eval $`echo $2` + if [ ! $? -eq 0 ] + then + echo "Failed!" + exit 1 + fi + echo "Done!" +} + +# Clean up old files which could hurt otherwise. +rm -f config.cache config.log config.status + +# Generate `aclocal.m4'. +rm -f aclocal.m4 +build "aclocal.m4" "ACLOCAL" + +# Generate `config.h.in'. +build "config.h.in" "AUTOHEADER" + +# Generate `configure' from `configure.ac'. +build "configure" "AUTOCONF" + +# Generate `ltmain.sh'. +#build "ltmain.sh" "LIBTOOLIZE" + +# Generate `stamp-h1' and all `Makefile.in' files. +rm -f stamp-h1 +build "Makefile templates" "AUTOMAKE" + +echo +echo "Run './configure ; make'" +echo --- epdfview-0.1.7.orig/debian/compat +++ epdfview-0.1.7/debian/compat @@ -0,0 +1 @@ +7 --- epdfview-0.1.7.orig/debian/mime +++ epdfview-0.1.7/debian/mime @@ -0,0 +1,2 @@ +application/pdf; epdfview %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf; priority=5 +application/x-pdf; epdfview %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf;priority=5 --- epdfview-0.1.7.orig/debian/copyright +++ epdfview-0.1.7/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Yves-Alexis Perez on +Fri, 23 Jun 2006 16:28:17 +0200 + +It was downloaded from +http://www.emma-soft.com/projects/epdfview/ + +Copyright Holder: © 2006, 2007, 2009 Jordi Fita + +License: + +You are free to distribute this software under the terms of +the GNU General Public License (version 2 or later). +On Debian systems, the complete text of the GNU General Public +License can be found in the file ‘/usr/share/common-licenses/GPL’ --- epdfview-0.1.7.orig/debian/README.Debian +++ epdfview-0.1.7/debian/README.Debian @@ -0,0 +1,9 @@ += Infos for epdfview +Yves-Alexis Perez +Tue, 25 Nov 2008 08:07:54 +0100 + +== Chinese fonts handling + +Chinese fonts will look bad if you don't have poppler-data package +installed. Look at http://bugzilla.gnome.org/show_bug.cgi?id=562198 and +-FIXME- --- epdfview-0.1.7.orig/debian/rules +++ epdfview-0.1.7/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +binary-post-install/epdfview:: + dh_desktop + ln -s ../epdfview/pixmaps/icon_epdfview-48.png debian/epdfview/usr/share/pixmaps/icon_epdfview-48.png --- epdfview-0.1.7.orig/debian/changelog +++ epdfview-0.1.7/debian/changelog @@ -0,0 +1,102 @@ +epdfview (0.1.7-2) unstable; urgency=low + + * debian/rules: + - install icon in the correct location. closes: #459263, #459263 + * debian/control: + - update standards version to 3.8.1. + * debian/patches: + - 02_fix-mouse-wheel added, fix scrolling with mouse wheel. closes: #527355 + - 03_nonexisting-file added, fix epdfview asking for password when + opening non-existant files. closes: #508969 + + -- Yves-Alexis Perez Fri, 15 May 2009 08:28:11 +0200 + +epdfview (0.1.7-1) unstable; urgency=low + + * New upstream release. + * debian/watch added. + * debian/patches/ + - 02_duplicate-function-parameters droped, merged upstream. + - 03_fix-segfault-on-print as well. + - 04_fix-keybindings too. + * debian/compat: bump to 7. + * debian/control: + - update build-dep on debhelper accordingly. + * debian/copyright: update dates. + + -- Yves-Alexis Perez Tue, 10 Mar 2009 00:06:29 +0100 + +epdfview (0.1.6-9) unstable; urgency=low + + * debian/patches: + - refresh 04_fix-keybindings. (really) closes: #470690 + + -- Yves-Alexis Perez Thu, 26 Feb 2009 08:13:22 +0100 + +epdfview (0.1.6-8) unstable; urgency=low + + * debian/control: + - Suggests: poppler-data for chinese handling. + * debian/README.Debian: + - add a note for chinese fonts handling. + * debian/patches: + - 04_fix-keybindings.patch added, add keybindings. closes: #470690 + * debian/control: + - add ${misc:Depends}. + + -- Yves-Alexis Perez Thu, 19 Feb 2009 23:33:47 +0100 + +epdfview (0.1.6-7) unstable; urgency=low + + * debian/control + - update build-dep from cupsys to cups. + + -- Yves-Alexis Perez Sun, 21 Sep 2008 15:09:01 +0200 + +epdfview (0.1.6-6) unstable; urgency=low + + * debian/control: + - add Provides: pdf-viewer. closes: #498561 + + -- Yves-Alexis Perez Sat, 20 Sep 2008 17:07:49 +0200 + +epdfview (0.1.6-5) unstable; urgency=low + + * debian/rules: call dh_desktop so the desktop database gets updated at + install. + * debian/control: update standards version to 3.8.0. + * debian/menu: add a Debian menu entry. closes: #485906 + * debian/epdfview.xpm: add an xpm icon for menu. + * debian/install: install xpm icon in /usr/share/pixmaps. + + -- Yves-Alexis Perez Thu, 03 Jul 2008 07:43:28 +0200 + +epdfview (0.1.6-4) unstable; urgency=low + + * debian/patches: 03_fix-segfault-on-print added. closes: #477200 + + -- Yves-Alexis Perez Mon, 21 Apr 2008 23:26:11 +0200 + +epdfview (0.1.6-3) unstable; urgency=low + + * add Debian mime information (thanks Jonny) closes: #471728 + * debian/copyright: add date and © sign. + + -- Yves-Alexis Perez Wed, 19 Mar 2008 22:57:50 +0100 + +epdfview (0.1.6-2) unstable; urgency=low + + * debian/control: + - add Homepage: field. + - correct GNOME spelling. + * debian/patches: + - 02_duplicate-function-parameters added, fix FTBFS with gcc-4.3, thanks + Martin Michlmayr. closes: Bug#462055 + + -- Yves-Alexis Perez Thu, 24 Jan 2008 00:16:26 +0100 + +epdfview (0.1.6-1) unstable; urgency=low + + * Initial release. closes: #375410 + + -- Yves-Alexis Perez Fri, 28 Dec 2007 11:33:21 +0100 --- epdfview-0.1.7.orig/debian/install +++ epdfview-0.1.7/debian/install @@ -0,0 +1 @@ +debian/epdfview.xpm /usr/share/pixmaps/ --- epdfview-0.1.7.orig/debian/menu +++ epdfview-0.1.7/debian/menu @@ -0,0 +1,3 @@ +?package(epdfview):needs="X11" section="Applications/Viewers"\ + title="Epdfview" command="/usr/bin/epdfview"\ + hints="Documents" icon="/usr/share/pixmaps/epdfview.xpm" --- epdfview-0.1.7.orig/debian/epdfview.xpm +++ epdfview-0.1.7/debian/epdfview.xpm @@ -0,0 +1,257 @@ +/* XPM */ +static char *epdfview[] = { +/* columns rows colors chars-per-pixel */ +"24 24 227 2", +" c black", +". c gray1", +"X c #070707", +"o c #090909", +"O c gray13", +"+ c #232323", +"@ c gray14", +"# c #282828", +"$ c #2E2D2D", +"% c #2F2F2E", +"& c #2F2F2F", +"* c #342525", +"= c gray19", +"- c #313131", +"; c #363333", +": c #353534", +"> c #363635", +", c gray21", +"< c #373737", +"1 c #383636", +"2 c gray22", +"3 c #393939", +"4 c gray23", +"5 c #3C3C3C", +"6 c gray24", +"7 c #3F3D3D", +"8 c #3E3E3E", +"9 c #462122", +"0 c #453031", +"q c #473333", +"w c #413738", +"e c gray25", +"r c #414141", +"t c gray26", +"y c #434343", +"u c #444443", +"i c #464645", +"p c gray28", +"a c #4A4A49", +"s c #4D4D4C", +"d c #4E4E4E", +"f c gray32", +"g c #606060", +"h c #646464", +"j c #6D6D6D", +"k c gray47", +"l c #883F41", +"z c #965B5C", +"x c #A24B4D", +"c c #9B6466", +"v c #BF7579", +"b c #DE6367", +"n c #DD6F71", +"m c #DD7073", +"M c #D17B7D", +"N c #EF676B", +"B c #E07275", +"V c #E27476", +"C c #F27C7F", +"Z c #F27E80", +"A c #808080", +"S c #838383", +"D c #848483", +"F c #988E8E", +"G c #909090", +"H c #939393", +"J c gray59", +"K c #989897", +"L c #989898", +"P c #9B9B9B", +"I c #9C9C9B", +"U c #9D9D9C", +"Y c #A49594", +"T c #A89999", +"R c #A0A09F", +"E c #A3A3A2", +"W c #A5A3A3", +"Q c #A5A5A5", +"! c #A7A7A5", +"~ c #AFA6A5", +"^ c gray67", +"/ c #ADADAC", +"( c #AFB0B0", +") c #B2B2B2", +"_ c gray70", +"` c #B4B4B4", +"' c #B6B6B5", +"] c gray72", +"[ c #BABAB9", +"{ c #BBBBBA", +"} c #BCBCBA", +"| c #BCBCBB", +" . c #BDBDBB", +".. c #DB8686", +"X. c #DF8789", +"o. c #DD8D8F", +"O. c #E6878B", +"+. c #ED9597", +"@. c #ED999B", +"#. c #EC999C", +"$. c #ED9FA2", +"%. c #C6A4A6", +"&. c #C8A0A2", +"*. c #E9A0A1", +"=. c #EFA4A6", +"-. c #EBACAD", +";. c #F7ADB0", +":. c #E0BCBB", +">. c #E9BBBD", +",. c #F0B1B2", +"<. c gray77", +"1. c #C5C5C4", +"2. c #C6C6C6", +"3. c #CCC2C2", +"4. c #C8C8C8", +"5. c #C9C9C8", +"6. c gray79", +"7. c #CBCBC9", +"8. c #CACACA", +"9. c #CCCCCB", +"0. c #D1D1D0", +"q. c #D2D2D0", +"w. c #D5D5D3", +"e. c gray83", +"r. c #D6D6D4", +"t. c #D9D9D7", +"y. c #DEDAD9", +"u. c #DDDDDB", +"i. c #DDDCDC", +"p. c #DDDDDD", +"a. c #DEDEDC", +"s. c #DFDFDD", +"d. c #DFDFDF", +"f. c #E0C4C5", +"g. c #E6C4C5", +"h. c #E4C7C6", +"j. c #EBC2C3", +"k. c #E9C4C3", +"l. c #EACDCD", +"z. c #F2C2C4", +"x. c #F9C5C7", +"c. c #F6C9CA", +"v. c #E6D5D5", +"b. c #EFD0D1", +"n. c #E8D6D6", +"m. c #F0D1D1", +"M. c #F5D4D5", +"N. c #FAD2D4", +"B. c #F3D7D8", +"V. c #FAD6D8", +"C. c #FADEDF", +"Z. c #E0E0DE", +"A. c #E1E1DF", +"S. c #E3E0DE", +"D. c #E2E2DF", +"F. c #EBE0DF", +"G. c #FBDFE0", +"H. c #E6E3E2", +"J. c #E4E4E3", +"K. c #E7E7E5", +"L. c #E7E7E6", +"P. c #EBE3E3", +"I. c #ECE6E5", +"U. c #EDE7E6", +"Y. c gray91", +"T. c #EAEAE8", +"R. c #EAEAE9", +"E. c #EAEAEA", +"W. c gray92", +"Q. c #ECECEA", +"!. c #EDECEA", +"~. c #EDECEB", +"^. c #EDEDEB", +"/. c #ECECEC", +"(. c #EDEDEC", +"). c gray93", +"_. c #EEEEEC", +"`. c #EFEEED", +"'. c #F2E3E3", +"]. c #F1E6E6", +"[. c #F5E4E4", +"{. c #F8E2E2", +"}. c #F8E6E6", +"|. c #F9E6E6", +" X c #F7EAE9", +".X c #F2EDED", +"XX c #F0EFEE", +"oX c #F8EAEB", +"OX c #FBEAEA", +"+X c #F0F0EF", +"@X c #F1F1F0", +"#X c #F2F1F0", +"$X c #F3F1F1", +"%X c #F2F2F0", +"&X c #F3F3F2", +"*X c #F3F3F3", +"=X c #F4F3F2", +"-X c #F4F4F2", +";X c #F4F4F4", +":X c #F5F5F4", +">X c gray96", +",X c #F6F6F6", +"X3.9 q ( _ ` ^ y y 2.>XY. gXgXgXgX", +" wX7X7X7X7X8.7 z f.,XuXuX*Xp.J 2 <.W. gXgXgXgX", +" qXXa Q gXgXgXgX", +" 6X-X=X&Xp W ].5XeXOX3XyXyXyXtXqX0.4 gXgXgXgX", +" ,X%X#X@X= T B.4X0X|.c.{.oX}. X2X`.@ gXgXgXgX", +" >X+X+X+X$ c g.[.M.z.,.=.+.@.$.#.l.+ gXgXgXgX", +" ;X).).~.w l &.j.m.'.$X.Xb.-.*.O.%.2 gXgXgXgX", +" &XQ.F.>.x * ~ y.^._.(.^.!.I.k.V 0 I gXgXgXgX", +" XXn.B b M 1 A 1.J.T.T.T.T.T.H.Y ; Z. gXgXgXgX", +" U.X.m n h.! % D 7.A.K.K.K.K.E u [ gXgXgXgX", +" P.o...:.S.w.E : 3 / t.a. .y > s gXgXgXgX", +" R.D.D.A.D.D.A.q.U , O O , K { } & o gXgXgX", +" L.Z.Z.Z.Z.Z.Z.Z.u.q.q.q.q.q.s.r. r 4 X gXgX", +" 9.6.5.5.5.5.5.5.4.4.4.4.4.4.4.4.' 8 # gX", +" 6 < X ", +"gXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX t - ", +"gXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgX . " +}; --- epdfview-0.1.7.orig/debian/control +++ epdfview-0.1.7/debian/control @@ -0,0 +1,16 @@ +Source: epdfview +Section: x11 +Priority: optional +Maintainer: Yves-Alexis Perez +Build-Depends: debhelper (>= 7.0.0), autotools-dev, cdbs, libgtk2.0-dev, libpoppler-glib-dev (>= 0.5), libcups2-dev +Standards-Version: 3.8.1 +Homepage: http://trac.emma-soft.com/epdfview/ + +Package: epdfview +Architecture: any +Provides: pdf-viewer +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: poppler-data +Description: Lightweight pdf viewer based on poppler libs + The aim of ePDFView is to make a simple PDF document viewer, in the lines of + Evince but without using the GNOME libraries. --- epdfview-0.1.7.orig/debian/watch +++ epdfview-0.1.7/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://trac.emma-soft.com/epdfview/wiki/Download/ \ + /epdfview/chrome/site/releases/epdfview-(\d+\.\d+\.\d+)\.tar\.gz --- epdfview-0.1.7.orig/debian/patches/02_fix-mouse-wheel.patch +++ epdfview-0.1.7/debian/patches/02_fix-mouse-wheel.patch @@ -0,0 +1,74 @@ +commit 17bb4a064b6c4d7ebd06416f1db2dab62ab72a43 +Author: jordi +Date: Fri Mar 20 08:06:32 2009 +0000 + + I had to change the return valud of MainView's scroll-event handler, since Gtk+ expects a gboolean that tells whether to propagate the event. Since we didn't return any value, depending on the compilation flags the mouse wheel didn't work at all. + + This closes #118. + + + git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@329 cb4bfb15-1111-0410-82e2-95233c8f1c7e + +diff --git a/src/gtk/MainView.cxx b/src/gtk/MainView.cxx +index b983bff..4a52cd3 100644 +--- a/src/gtk/MainView.cxx ++++ b/src/gtk/MainView.cxx +@@ -77,7 +77,7 @@ static void main_window_zoom_in_cb (GtkWidget *, gpointer); + static void main_window_zoom_out_cb (GtkWidget *, gpointer); + static void main_window_zoom_width_cb (GtkToggleAction *, gpointer); + static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer); +-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); ++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); + + #if defined (HAVE_CUPS) + static void main_window_print_cb (GtkWidget *, gpointer); +@@ -1479,18 +1479,25 @@ main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpoi + pter->setPageMode (mode); + } + +-void ++gboolean + main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data) + { + g_assert ( NULL != data && "The data parameter is NULL."); + + MainPter *pter = (MainPter *)data; + // Only zoom when the CTRL-Button is down... +- if ( !(event->state & GDK_CONTROL_MASK) ) return; +- if ( event->direction == GDK_SCROLL_UP ) { +- pter->zoomInActivated (); +- } else if ( event->direction == GDK_SCROLL_DOWN ) { +- pter->zoomOutActivated (); ++ if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) ) ++ { ++ if ( event->direction == GDK_SCROLL_UP ) ++ { ++ pter->zoomInActivated (); ++ } ++ else if ( event->direction == GDK_SCROLL_DOWN ) ++ { ++ pter->zoomOutActivated (); ++ } ++ return TRUE; + } ++ return FALSE; + } + +diff --git a/src/gtk/PageView.cxx b/src/gtk/PageView.cxx +index 0546561..adaa823 100644 +--- a/src/gtk/PageView.cxx ++++ b/src/gtk/PageView.cxx +@@ -527,13 +527,6 @@ page_view_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data) + { + g_assert ( NULL != data && "The data parameter is NULL."); + +- // don't scroll when the CRTL-Button is down, because then the page should +- // actually be zoomed and not scrolled. Zooming is handelt by the MainView +- // class. +- if ( event->state & GDK_CONTROL_MASK ) +- { +- return FALSE; +- } + PagePter *pter = (PagePter *)data; + GtkAdjustment *adjustment = + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); --- epdfview-0.1.7.orig/debian/patches/01_browser_command.patch +++ epdfview-0.1.7/debian/patches/01_browser_command.patch @@ -0,0 +1,11 @@ +--- src/Config.cxx.orig 2006-06-12 21:23:34.000000000 +0200 ++++ src/Config.cxx 2006-06-23 16:42:19.000000000 +0200 +@@ -22,7 +22,7 @@ + using namespace ePDFView; + + // Constants +-static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "firefox %s"; ++static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "x-www-browser %s"; + static const gchar *DEFAULT_OPEN_FILE_FOLDER = NULL; + static const gchar *DEFAULT_SAVE_FILE_FOLDER = NULL; + static const gboolean DEFAULT_SHOW_STATUSBAR = TRUE; --- epdfview-0.1.7.orig/debian/patches/03_nonexisting-file.patch +++ epdfview-0.1.7/debian/patches/03_nonexisting-file.patch @@ -0,0 +1,64 @@ +diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx +index 6567e9b..f5710e7 100644 +--- a/src/PDFDocument.cxx ++++ b/src/PDFDocument.cxx +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include "epdfview.h" + +@@ -210,7 +211,7 @@ PDFDocument::loadFile (const gchar *filename, const gchar *password, + return FALSE; + } + // Try to open the PDF document. +- GError *loadError = NULL; ++ + // In case the user specified to read the PDF file from the stdin + // (i.e., -), then we save the contents of the stdin to a temporary + // file and use the URI to this temporary file to load. +@@ -241,38 +242,12 @@ PDFDocument::loadFile (const gchar *filename, const gchar *password, + } + } + PopplerDocument *newDocument = +- poppler_document_new_from_file (filename_uri, password, &loadError); ++ poppler_document_new_from_file (filename_uri, password, error); + g_free (filename_uri); + // Check if the document couldn't be opened successfully and why. +- if ( NULL == newDocument ) +- { +- // Poppler's glib wrapper passes the Poppler error code unless the +- // error is that the file is encrypted. We want to set our own +- // error code in this case. +- DocumentError errorCode = DocumentErrorNone; +- if ( POPPLER_ERROR == loadError->domain ) +- { +- errorCode = DocumentErrorEncrypted; +- } +- else +- { +- // OK, the glib's wrapper don't pass the error code directly +- // from Poppler. Instead returns G_FILE_ERROR_FAILED and a +- // non translated string. +- // Maybe I'm wrong (very probable) but that's a wrong way. +- // So I'm reading the error code from the error string... +- sscanf (loadError->message, "Failed to load document (error %d)", +- (gint *)&errorCode); +- } +- g_error_free (loadError); +- // Get our error message. +- gchar *errorMessage = IDocument::getErrorMessage (errorCode); +- g_set_error (error, +- EPDFVIEW_DOCUMENT_ERROR, errorCode, +- _("Failed to load document '%s'.\n%s\n"), +- filename, errorMessage); +- g_free (errorMessage); +- ++ if ( !newDocument ) { ++ if ( (*error)->code && (*error)->code==POPPLER_ERROR_ENCRYPTED ) ++ (*error)->code = DocumentErrorEncrypted; + return FALSE; + } +