diff -u hylafax-6.0.3/debian/changelog hylafax-6.0.3/debian/changelog --- hylafax-6.0.3/debian/changelog +++ hylafax-6.0.3/debian/changelog @@ -1,3 +1,13 @@ +hylafax (2:6.0.3-5.1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: LP: #503434 + - debian/hyla.conf: + + Updated description of fontmap to include lucid + - debian/hylafax-server.hylafax.default: + - look for faxgetty in both /etc/inittab and /etc/event.d/* + + -- Bhavani Shankar Tue, 05 Jan 2010 19:54:26 +0530 + hylafax (2:6.0.3-5.1) unstable; urgency=low * Non-maintainer upload. @@ -24,6 +34,16 @@ -- Giuseppe Sacco Sat, 22 Aug 2009 23:41:16 +0200 +hylafax (2:6.0.3-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #412009 + - debian/hyla.conf: + + Updated description of fontmap to include karmic + - debian/hylafax-server.hylafax.default: + - look for faxgetty in both /etc/inittab and /etc/event.d/* + + -- Bhavani Shankar Thu, 20 Aug 2009 21:03:04 +0530 + hylafax (2:6.0.3-2) unstable; urgency=low * Selected bash as shell interpreter for mailfax examples @@ -87,6 +107,23 @@ -- Giuseppe Sacco Sat, 18 Apr 2009 22:28:31 +0200 +hylafax (2:4.4.4-10.1ubuntu2) jaunty; urgency=low + + * debian/control: + - Add XSBC-Original-Maintainer and change Maintainer field + + -- Ante Karamatic Tue, 27 Jan 2009 09:05:00 +0100 + +hylafax (2:4.4.4-10.1ubuntu1) jaunty; urgency=low + + * debian/hyla.conf: + - added /usr/share/ghostscript/8.64/lib to FontMap + * debian/hylafax-server.hylafax.default: + - look for faxgetty in both /etc/inittab and /etc/event.d/* + - Closes LP: #270916 + + -- Ante Karamatic Tue, 27 Jan 2009 08:38:09 +0100 + hylafax (2:4.4.4-10.1) unstable; urgency=medium * Non-maintainer upload @@ -1423,0 +1461 @@ + diff -u hylafax-6.0.3/debian/control hylafax-6.0.3/debian/control --- hylafax-6.0.3/debian/control +++ hylafax-6.0.3/debian/control @@ -1,5 +1,6 @@ Source: hylafax -Maintainer: Giuseppe Sacco +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Giuseppe Sacco Section: comm Priority: extra Standards-Version: 3.8.3.0 diff -u hylafax-6.0.3/debian/hyla.conf hylafax-6.0.3/debian/hyla.conf --- hylafax-6.0.3/debian/hyla.conf +++ hylafax-6.0.3/debian/hyla.conf @@ -37,7 +37,7 @@ # AutoCoverPage: No -# These three fontMap paths are for etch:sarge:woody +# These three fontMap paths are for etch:sarge:woody:ubuntu-lucid FontMap: /usr/share/ghostscript/8.70/lib:/usr/share/ghostscript/8.62/lib:/usr/share/gs-esp/8.15/lib:/usr/share/gs-esp/7.07/lib:/usr/share/gs/6.53 FontPath: /usr/share/fonts/type1/gsfonts only in patch2: unchanged: --- hylafax-6.0.3.orig/debian/hylafax-server.hylafax.default +++ hylafax-6.0.3/debian/hylafax-server.hylafax.default @@ -1,7 +1,7 @@ # default settings for hylafax server # try to check for the correct USE_FAXGETTY value -if grep -E '^[^#]*:respawn:/usr/sbin/fax(getty|modem).*$' /etc/inittab >/dev/null 2>&1 +if grep -E '^[^#]*:respawn:/usr/sbin/fax(getty|modem).*$' /etc/inittab >/dev/null 2>&1 || grep -E '^exec /usr/sbin/fax(getty|modem)' /etc/event.d/* >/dev/null 2>&1 then USE_FAXGETTY=init else