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

Import Debian changes 0.4.5-3

xournal (0.4.5-3) unstable; urgency=low

  * Add -lz and -X11 to link flags (Closes: #617637, #556718)
  * Add ${misc:Depends} to debian/control
  * Upgrade to Standards-Version 3.9.1 (no changes)
parent 906c42b6
xournal (0.4.5-3) unstable; urgency=low
* Add -lz and -X11 to link flags (Closes: #617637, #556718)
* Add ${misc:Depends} to debian/control
* Upgrade to Standards-Version 3.9.1 (no changes)
-- Carlo Segre <segre@debian.org> Sat, 26 Mar 2011 14:18:31 -0500
xournal (0.4.5-2) unstable; urgency=low
* Patch from Gentoo and Ubuntu to xo-print.c (Closes: #552075)
......
......@@ -2,15 +2,14 @@ Source: xournal
Section: x11
Priority: optional
Maintainer: Carlo Segre <segre@debian.org>
Build-Depends: debhelper (>= 7), autoconf, automake, quilt,
libgtk2.0-dev (>= 2.10), libgnomecanvas2-dev,
libpoppler-glib-dev (>= 0.5.4)
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 7), autoconf, automake, libgtk2.0-dev (>= 2.10),
libgnomecanvas2-dev, libpoppler-glib-dev (>= 0.5.4)
Standards-Version: 3.9.1
Homepage: http://xournal.sourceforge.net/
Package: xournal
Architecture: any
Depends: ${shlibs:Depends}, ghostscript-x
Depends: ${shlibs:Depends}, ${misc:Depends}, ghostscript-x
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
@@ -22,3 +22,4 @@
@@ -20,5 +20,6 @@
xo-callbacks.c xo-callbacks.h \
xo-shapes.c xo-shapes.h
xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
-xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
+xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
+xournal_LDFLAGS = -Wl,--as-needed
......@@ -9,8 +9,6 @@
# 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)))
......@@ -20,7 +18,7 @@ else
endif
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
configure-stamp:
dh_testdir
# Configure the package.
./autogen.sh --prefix=/usr
......@@ -36,7 +34,7 @@ build-stamp: configure-stamp
touch build-stamp
clean: unpatch
clean:
dh_testdir
dh_testroot
......
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