--- gozer-0.7.nofont.1.orig/src/main.c +++ gozer-0.7.nofont.1/src/main.c @@ -156,13 +156,27 @@ opt.fn_r, opt.fn_g, opt.fn_b, opt.fn_a); break; case JUST_CENTER: - x = ((((opt.bg_resize && bgw) ? bgw : w) - ww) / 2); + if (opt.x) + { + x = (opt.x - ( ww / 2 )); + } + else + { + x = ((((opt.bg_resize && bgw) ? bgw : w) - ww) / 2); + } /* y = ((((opt.bg_resize && bgw) ? bgh : h) - hh) / 2); */ gib_imlib_text_draw(image, fn, style, x, y, p, IMLIB_TEXT_TO_RIGHT, opt.fn_r, opt.fn_g, opt.fn_b, opt.fn_a); break; case JUST_RIGHT: + if (opt.x) + { + x = opt.x - ww; + } + else + { x = (((opt.bg_resize && bgw) ? bgw : w) - ww); + } gib_imlib_text_draw(image, fn, style, x, y, p, IMLIB_TEXT_TO_RIGHT, opt.fn_r, opt.fn_g, opt.fn_b, opt.fn_a); --- gozer-0.7.nofont.1.orig/debian/compat +++ gozer-0.7.nofont.1/debian/compat @@ -0,0 +1 @@ +4 --- gozer-0.7.nofont.1.orig/debian/watch +++ gozer-0.7.nofont.1/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=dversionmangle=s/\.nofont\.\d+$// \ + http://linuxbrit.co.uk/downloads/gozer-(.*)\.tar\.gz --- gozer-0.7.nofont.1.orig/debian/changelog +++ gozer-0.7.nofont.1/debian/changelog @@ -0,0 +1,126 @@ +gozer (0.7.nofont.1-4) unstable; urgency=low + + * debian/watch: Strip the "nofont" from the debian version. + * src/main.c: Patch from Scott Barker to not ignore the x offset when + right justification and a background image set. (Closes: #464071) + + -- Eric Dorland Mon, 24 Mar 2008 00:23:27 -0400 + +gozer (0.7.nofont.1-3) unstable; urgency=low + + * src/main.c: Apply patch from Scott Barker to fix center justification + around the x offset. (Closes: #456174) + * debian/control: + - Add Homepage and Vcs-* headers. + - Bump Standards-Version to 3.7.3.0. + + -- Eric Dorland Sun, 06 Jan 2008 23:55:04 -0500 + +gozer (0.7.nofont.1-2) unstable; urgency=low + + * debian/rules: Install only the AUTHORS doc. (Closes: #315546) + * debian/docs: Remove. + * debian/watch: Add watch file. + * debian/control: Standards-Version to 3.7.2.1. + + -- Eric Dorland Fri, 4 Aug 2006 20:20:10 -0400 + +gozer (0.7.nofont.1-1) unstable; urgency=high + + * Ok, first try didn't go so well. Try it again. + * Repackage the tarball and package without the non-free font. (Closes: + #298948) + + -- Eric Dorland Thu, 7 Apr 2005 00:44:14 -0400 + +gozer (0.7.nofont-1) unstable; urgency=high + + * Unreleased. + * Repackage the tarball and package without the non-free font. (Closes: + #298948) + + -- Eric Dorland Fri, 1 Apr 2005 00:03:03 -0500 + +gozer (0.7-3) unstable; urgency=low + + * Let's get ready for sarge. + * debian/rules: Convert to cdbs, that's the successor to Colin's Build + System. + * debian/control: + - Build depend on cdbs, so debhelper depend to >> 4.1. + - Standards-Version to 3.6.1.0. + - Build depend on libfreetype instead of libttf. + - Build depend on new libx11-dev. + + -- Eric Dorland Wed, 5 May 2004 00:22:56 -0400 + +gozer (0.7-2) unstable; urgency=low + + * Use Colin's Build System to make life easier. + * debian/control: + + Build-dep on debhelper > 4. + + Standards-Version to 3.5.8.0 + + Remove recommends on ttf-openoffice. + * debian/gozer.install: Install the gozerrc file. + * debian/rocks: Remove the silly doc dir Tom's makefile generates. + + -- Eric Dorland Fri, 13 Dec 2002 21:20:13 -0500 + +gozer (0.7-1) unstable; urgency=low + + * New upstream release. + * Add debian/compat file. + + -- Eric Dorland Sat, 11 May 2002 15:40:45 -0400 + +gozer (0.5-1) unstable; urgency=low + + * New upstream version. + * Fonts removed from upstream to resolve licensing problem. + (Closes: #130179) + * Removed useless README and TODO files. (Closes: #130175) + * Added Recommends to ttf-openoffice. + * Added openoffice font paths to default gozerrc. + + -- Eric Dorland Sat, 26 Jan 2002 15:20:29 -0500 + +gozer (0.4-1) unstable; urgency=low + + * New upstream version. + + -- Eric Dorland Sat, 19 Jan 2002 14:54:24 -0500 + +gozer (0.3-3) unstable; urgency=low + + * Changed Build-Depends on freetype2-dev to libttf-dev. (Closes: #126066) + + -- Eric Dorland Fri, 21 Dec 2001 12:51:37 -0500 + +gozer (0.3-2) unstable; urgency=low + + * Fix spelling error in description. (Closes: #124691) + + -- Eric Dorland Tue, 18 Dec 2001 19:54:34 -0500 + +gozer (0.3-1) unstable; urgency=low + + * New upstream release. + * Updated to debhelper 3. + * Updated standards version to 3.5.6.0. + * Removed crufty CVS directory. + + -- Eric Dorland Wed, 17 Oct 2001 15:12:33 -0400 + +gozer (0.2-2) unstable; urgency=low + + * General cleanup of cruft. + * Change maintainer email address. + + -- Eric Dorland Fri, 15 Jun 2001 22:39:17 -0400 + +gozer (0.2-1) unstable; urgency=low + + * Initial Release. (Closes: #84624) + + -- Eric Dorland Fri, 26 Jan 2001 20:20:44 -0500 + --- gozer-0.7.nofont.1.orig/debian/gozerrc +++ gozer-0.7.nofont.1/debian/gozerrc @@ -0,0 +1 @@ +fontpath /usr/share/fonts/truetype:/usr/share/fonts/truetype/openoffice --- gozer-0.7.nofont.1.orig/debian/gozer.install +++ gozer-0.7.nofont.1/debian/gozer.install @@ -0,0 +1 @@ +debian/gozerrc etc/ --- gozer-0.7.nofont.1.orig/debian/copyright +++ gozer-0.7.nofont.1/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Eric Dorland on +Thu, 26 Oct 2000 20:29:54 -0400. + +It was downloaded from http://www.linuxbrit.co.uk/ + +Upstream Author: Tom Gilbert + +Copyright: + +Copyright (C) 1999,2000 Tom Gilbert. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies of the Software and its documentation and acknowledgment shall be +given in the documentation and software packages that this Software was +used. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + --- gozer-0.7.nofont.1.orig/debian/rules +++ gozer-0.7.nofont.1/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_INSTALL_DOCS_ALL = AUTHORS + +common-binary-arch:: + rm -rf $(CURDIR)/debian/gozer/usr/doc --- gozer-0.7.nofont.1.orig/debian/control +++ gozer-0.7.nofont.1/debian/control @@ -0,0 +1,18 @@ +Source: gozer +Section: graphics +Priority: optional +Maintainer: Eric Dorland +Build-Depends: debhelper (>= 4.1), cdbs, libimlib2-dev, libfreetype6-dev, libx11-dev, giblib-dev +Standards-Version: 3.7.3.0 +Homepage: http://linuxbrit.co.uk/gozer/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/gozer.git +Vcs-Git: git://git.debian.org/git/collab-maint/gozer.git + +Package: gozer +Architecture: any +Depends: ${shlibs:Depends} +Description: a text renderer + It's a commandline text renderer. It will take text on the + commandline or from a file and render it using antialiased TrueType + fonts, using optional font styles, word wrapping, justification and + layout control.