diff --git a/COPYING b/COPYING index 5b6e7c6..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,10 +303,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/ChangeLog b/ChangeLog index 84bb517..c067de9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Wed Feb 29 15:07:01 2012 Till Kamppeter + + * Allow installing only the CUPS .drv file instead of ready-made PPD + files (SF: #3446934, thanks to Jiri Popelka from Red Hat for the + patch). + + * Allow installing PPD files into a custom directory (SF: #3446190, + thanks to Jiri Popelka from Red Hat for the patch). + + * Do not strip the compiled executable when installing via "make + install" to preserve the symbols when the compilation was done + in debug mode (SF: #3444332, thanks to Jiri Popelka from Red Hat for + the patch). + + * Removed executable bit from the files include/algo0x0d.h, + include/algo0x0e.h, src/algo0x0e.cpp, ppd/po/pt.po (SF: #3444284, + thanks to Jiri Popelka from Red Hat). + + * Corrected address of the FSF (SF: #3444266, thanks to Jiri Popelka + from Red Hat for the patch). + Wed Dec 06 22:46:01 2011 Till Kamppeter * Added new printer: diff --git a/INSTALL b/INSTALL index 92d8386..3b1f10e 100644 --- a/INSTALL +++ b/INSTALL @@ -114,6 +114,9 @@ memory will use an average of 9Mo of RAM. Other pages are swapped into the disk. A little CACHESIZE value will increase disk access and increase the job rendering time. + * DRV_ONLY=1 [0 by default]: + Don't install PPD files at all, only DRV + (driver information file) files. Example: diff --git a/debian/changelog b/debian/changelog index aff6978..a822c46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +splix (2.0.0+svn306-1) unstable; urgency=low + + * New upstream version: allows installing .drv files instead of PPDs. + * The last patent on JBIG has now expired and we have libjbig in + Debian, let's use it. (Closes: #457650, #507247) + * Bump Standards-Version to 3.9.3 (no changes needed). + * Thanks to Didier Raboud for the prevois NMU. + + -- Luca Niccoli Mon, 23 Apr 2012 00:01:30 +0200 + splix (2.0.0+svn300-1.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 439fb4e..c3901c7 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Section: text Priority: optional Maintainer: Luca Niccoli -Build-Depends: debhelper (>= 7), libcupsimage2-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 7), libcupsimage2-dev, libjbig-dev +Standards-Version: 3.9.3 Homepage: http://splix.ap2c.org/ Package: printer-driver-splix diff --git a/debian/patches/0002-Change-libjkit-name.patch b/debian/patches/0002-Change-libjkit-name.patch new file mode 100644 index 0000000..89dc82f --- /dev/null +++ b/debian/patches/0002-Change-libjkit-name.patch @@ -0,0 +1,13 @@ +Index: splix-2.0.0+svn306/module.mk +=================================================================== +--- splix-2.0.0+svn306.orig/module.mk 2012-02-29 15:59:36.132483000 +0100 ++++ splix-2.0.0+svn306/module.mk 2012-04-14 20:11:39.214848247 +0200 +@@ -48,7 +48,7 @@ + ifneq ($(DISABLE_JBIG),0) + CXXFLAGS += -DDISABLE_JBIG + else +-rastertoqpdl_LIBS += -ljbig85 ++rastertoqpdl_LIBS += -ljbig + endif + ifneq ($(DISABLE_BLACKOPTIM),0) + CXXFLAGS += -DDISABLE_BLACKOPTIM diff --git a/debian/patches/0002-Rename-drv.patch b/debian/patches/0002-Rename-drv.patch new file mode 100644 index 0000000..1f38b67 --- /dev/null +++ b/debian/patches/0002-Rename-drv.patch @@ -0,0 +1,13 @@ +Index: splix-2.0.0+svn306/ppd/Makefile +=================================================================== +--- splix-2.0.0+svn306.orig/ppd/Makefile 2012-04-22 23:22:15.213881971 +0200 ++++ splix-2.0.0+svn306/ppd/Makefile 2012-04-22 23:23:55.362378597 +0200 +@@ -151,7 +151,7 @@ + $(call printCmd, $(cmd_install_drv)) + $(Q)install -d -m 755 ${DESTDIR}${CUPSDRV} + $(Q)for filename in ${DRVS}; do \ +- install -m 644 $$filename ${DESTDIR}${CUPSDRV};\ ++ install -m 644 $$filename ${DESTDIR}${CUPSDRV}/splix-$$filename;\ + done; + endif + diff --git a/debian/patches/series b/debian/patches/series index 171c327..1b2d9fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Fix-alignment-problem-on-armel.patch +0002-Rename-drv.patch diff --git a/debian/rules b/debian/rules index 62aea5a..c764e09 100755 --- a/debian/rules +++ b/debian/rules @@ -13,14 +13,14 @@ build-indep: build-stamp build-stamp: configure-stamp dh_testdir - /usr/bin/make DISABLE_JBIG=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread" pstoqpdl_LIBS="-lcupsimage -lcups" + /usr/bin/make DRV_ONLY=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread -ljbig" pstoqpdl_LIBS="-lcupsimage -lcups -ljbig" touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - $(MAKE) clean DISABLE_JBIG=1 + $(MAKE) clean DRV_ONLY=1 dh_clean optimized/pstoqpdl optimized/rastertoqpdl optimized/src/* debug/src/* .defs.mk install: build @@ -28,7 +28,7 @@ dh_testroot dh_prep dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/printer-driver-splix CUPSPPD=/usr/share/ppd/splix DISABLE_JBIG=1 install + $(MAKE) DESTDIR=$(CURDIR)/debian/printer-driver-splix CUPSPPD=/usr/share/ppd/splix DRV_ONLY=1 install install -D --mode=644 debian/splix.ppd-updater $(CURDIR)/debian/printer-driver-splix/usr/share/cups/ppd-updaters/splix.ppd-updater # Build architecture-dependent files here. diff --git a/include/algo0x0d.h b/include/algo0x0d.h old file mode 100755 new file mode 100644 index de32975..bc7f1a4 100644 --- a/include/algo0x0d.h +++ b/include/algo0x0d.h @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x0d.h 268 2010-07-29 10:10:15Z tillkamppeter $ + * $Id: algo0x0d.h 303 2012-02-29 14:43:25Z tillkamppeter $ * -- * This code is written by Leonardo Hamada */ diff --git a/include/algo0x0e.h b/include/algo0x0e.h old file mode 100755 new file mode 100644 index 9d29af0..7104ed7 100644 --- a/include/algo0x0e.h +++ b/include/algo0x0e.h @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x0e.h 245 2008-11-24 23:00:43Z ap2c $ + * $Id: algo0x0e.h 303 2012-02-29 14:43:25Z tillkamppeter $ * -- * This code has been written by Leonardo Hamada */ diff --git a/include/algo0x11.h b/include/algo0x11.h index 1b95d8b..080eee2 100644 --- a/include/algo0x11.h +++ b/include/algo0x11.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x11.h 157 2008-02-09 02:01:24Z ap2c $ + * $Id: algo0x11.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _ALGO0X11_H_ diff --git a/include/algo0x13.h b/include/algo0x13.h index b056996..7cf1e2b 100644 --- a/include/algo0x13.h +++ b/include/algo0x13.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x13.h 287 2011-02-19 19:10:22Z tillkamppeter $ + * $Id: algo0x13.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _ALGO0X13_H_ diff --git a/include/algo0x15.h b/include/algo0x15.h index 88837df..cce9d9c 100644 --- a/include/algo0x15.h +++ b/include/algo0x15.h @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id: algo0x15.h 287 2011-02-19 19:10:22Z tillkamppeter $ * -- diff --git a/include/algorithm.h b/include/algorithm.h index 807a720..d3b929d 100644 --- a/include/algorithm.h +++ b/include/algorithm.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algorithm.h 157 2008-02-09 02:01:24Z ap2c $ + * $Id: algorithm.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _ALGORITHM_H_ diff --git a/include/band.h b/include/band.h index a9d762a..5be8aed 100644 --- a/include/band.h +++ b/include/band.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: band.h 140 2008-01-31 18:33:18Z ap2c $ + * $Id: band.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _BAND_H_ diff --git a/include/bandplane.h b/include/bandplane.h index b90bfe6..08eb565 100644 --- a/include/bandplane.h +++ b/include/bandplane.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: bandplane.h 247 2008-11-24 23:18:31Z ap2c $ + * $Id: bandplane.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _BANDPLANE_H_ diff --git a/include/cache.h b/include/cache.h index cd1b8c5..0bb829f 100644 --- a/include/cache.h +++ b/include/cache.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: cache.h 141 2008-02-01 00:10:50Z ap2c $ + * $Id: cache.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _CACHE_H_ diff --git a/include/colors.h b/include/colors.h index 3a60de7..d4a0ef0 100644 --- a/include/colors.h +++ b/include/colors.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: colors.h 136 2008-01-30 17:15:49Z ap2c $ + * $Id: colors.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _COLORS_H_ diff --git a/include/compress.h b/include/compress.h index b994efe..5e79ff3 100644 --- a/include/compress.h +++ b/include/compress.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: compress.h 127 2008-01-28 17:52:50Z ap2c $ + * $Id: compress.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _COMPRESS_H_ diff --git a/include/core.h b/include/core.h index 51f3d68..ea20066 100644 --- a/include/core.h +++ b/include/core.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: core.h 119 2008-01-22 23:06:29Z ap2c $ + * $Id: core.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _CORE_H_ diff --git a/include/document.h b/include/document.h index 2679c35..5998e37 100644 --- a/include/document.h +++ b/include/document.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: document.h 137 2008-01-31 14:41:36Z ap2c $ + * $Id: document.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _DOCUMENT_H_ diff --git a/include/errlog.h b/include/errlog.h index d110068..0793620 100644 --- a/include/errlog.h +++ b/include/errlog.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: errlog.h 221 2008-06-14 23:03:24Z ap2c $ + * $Id: errlog.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _ERRLOG_H_ diff --git a/include/options.h b/include/options.h index 85eaf8b..21b8ab4 100644 --- a/include/options.h +++ b/include/options.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: options.h 190 2008-02-10 15:30:10Z ap2c $ + * $Id: options.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _OPTIONS_H_ diff --git a/include/page.h b/include/page.h index 54de9f7..5806b58 100644 --- a/include/page.h +++ b/include/page.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: page.h 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: page.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _PAGE_H_ diff --git a/include/ppdfile.h b/include/ppdfile.h index ccf832e..e1475a8 100644 --- a/include/ppdfile.h +++ b/include/ppdfile.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ppdfile.h 266 2009-04-05 14:44:11Z ap2c $ + * $Id: ppdfile.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _PPDFILE_H_ diff --git a/include/printer.h b/include/printer.h index ff86479..24359a7 100644 --- a/include/printer.h +++ b/include/printer.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: printer.h 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: printer.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _PRINTER_H_ diff --git a/include/qpdl.h b/include/qpdl.h index 822f559..85ee479 100644 --- a/include/qpdl.h +++ b/include/qpdl.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: qpdl.h 152 2008-02-02 21:00:53Z ap2c $ + * $Id: qpdl.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _QPDL_H_ diff --git a/include/rendering.h b/include/rendering.h index d6b251c..3297b95 100644 --- a/include/rendering.h +++ b/include/rendering.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: rendering.h 151 2008-02-02 20:21:34Z ap2c $ + * $Id: rendering.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _RENDERING_H_ diff --git a/include/request.h b/include/request.h index 23d55f5..3f19d17 100644 --- a/include/request.h +++ b/include/request.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: request.h 151 2008-02-02 20:21:34Z ap2c $ + * $Id: request.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _REQUEST_H_ diff --git a/include/semaphore.h b/include/semaphore.h index 1b108d0..81b19b4 100644 --- a/include/semaphore.h +++ b/include/semaphore.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: semaphore.h 138 2008-01-31 14:42:24Z ap2c $ + * $Id: semaphore.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _SEMAPHORE_H_ diff --git a/include/version.h b/include/version.h index e1619d2..9477f1e 100644 --- a/include/version.h +++ b/include/version.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: version.h 282 2010-08-02 11:41:53Z tillkamppeter $ + * $Id: version.h 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef _VERSION_H_ diff --git a/module.mk b/module.mk index 966d927..9b6229c 100644 --- a/module.mk +++ b/module.mk @@ -9,6 +9,7 @@ # Compilation option: # V=1 Verbose mode # DESTDIR=xxx Change the destination directory prefix +# DRV_ONLY Don't install PPD files at all, only DRV files. MODE := optimized @@ -23,6 +24,7 @@ DISABLE_JBIG ?= 0 DISABLE_THREADS ?= 0 DISABLE_BLACKOPTIM ?= 0 +DRV_ONLY ?= 0 # Flags @@ -55,7 +57,8 @@ # Get some information CUPSFILTER := `cups-config --serverbin`/filter -CUPSPPD := `cups-config --datadir`/model +CUPSPPD ?= `cups-config --datadir`/model +CUPSDRV ?= `cups-config --datadir`/drv ifeq ($(ARCHI),Darwin) PSTORASTER := pstocupsraster else @@ -63,7 +66,7 @@ endif GSTORASTER := gstoraster CUPSPROFILE := `cups-config --datadir`/profiles -export CUPSFILTER CUPSPPD +export CUPSFILTER CUPSPPD CUPSDRV # Specific information needed by pstoqpdl diff --git a/ppd/Makefile b/ppd/Makefile index 618388b..fee411c 100644 --- a/ppd/Makefile +++ b/ppd/Makefile @@ -5,7 +5,8 @@ # # -SOURCE := samsung.drv dell.drv xerox.drv lexmark.drv toshiba.drv +SOURCE := samsung.drv.in dell.drv.in xerox.drv.in lexmark.drv.in toshiba.drv.in +DRVS := samsung.drv dell.drv xerox.drv lexmark.drv toshiba.drv DELL := 1100 1110 SAMSUNG := clp500 clp550 clp510 clp610 clp610nd ml1510 ml1520 ml1610 \ ml1630 ml1640 ml1660 ml1710 ml1740 ml1750 ml1910 ml1915 \ @@ -42,39 +43,47 @@ all: +.PHONY: drv +drv: $(SOURCE) + ./compile.sh samsung.drv.in drv + ./compile.sh dell.drv.in drv + ./compile.sh xerox.drv.in drv + ./compile.sh lexmark.drv.in drv + ./compile.sh toshiba.drv.in drv + .PHONY: ppd ppd: $(DRIVER) $(LANGDRIVERSEXT) $(DRIVER): $(SOURCE) - ./compile.sh samsung.drv -I . -d ./ - ./compile.sh dell.drv -I . -d ./ - ./compile.sh xerox.drv -I . -d ./ - ./compile.sh lexmark.drv -I . -d ./ - ./compile.sh toshiba.drv -I . -d ./ + ./compile.sh samsung.drv.in -I . -d ./ + ./compile.sh dell.drv.in -I . -d ./ + ./compile.sh xerox.drv.in -I . -d ./ + ./compile.sh lexmark.drv.in -I . -d ./ + ./compile.sh toshiba.drv.in -I . -d ./ $(LANGDRIVERSEXT): $(SOURCE) $(patsubst %, $(PODIR)/%.$(POEXT), $(LANGUAGES)) lang=$(patsubst $(MASTERDRIVER)%.$(DRIVERSEXT),%, $@); \ - ./compile.sh samsung.drv -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ + ./compile.sh samsung.drv.in -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ for filename in ${SAMSUNG}; do \ recode utf8..latin1 ${PODIR}/$$lang/$$filename.${DRIVERSEXT}; \ mv ${PODIR}/$$lang/$$filename.${DRIVERSEXT} $$filename$$lang.${DRIVERSEXT}; \ done; \ - ./compile.sh xerox.drv -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ + ./compile.sh xerox.drv.in -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ for filename in ${XEROX}; do \ recode utf8..latin1 ${PODIR}/$$lang/$$filename.${DRIVERSEXT}; \ mv ${PODIR}/$$lang/$$filename.${DRIVERSEXT} $$filename$$lang.${DRIVERSEXT}; \ done; \ - ./compile.sh dell.drv -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ + ./compile.sh dell.drv.in -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ for filename in ${DELL}; do \ recode utf8..latin1 ${PODIR}/$$lang/$$filename.${DRIVERSEXT}; \ mv ${PODIR}/$$lang/$$filename.${DRIVERSEXT} $$filename$$lang.${DRIVERSEXT}; \ done; \ - ./compile.sh lexmark.drv -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ + ./compile.sh lexmark.drv.in -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ for filename in ${LEXMARK}; do \ recode utf8..latin1 ${PODIR}/$$lang/$$filename.${DRIVERSEXT}; \ mv ${PODIR}/$$lang/$$filename.${DRIVERSEXT} $$filename$$lang.${DRIVERSEXT}; \ done; \ - ./compile.sh toshiba.drv -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ + ./compile.sh toshiba.drv.in -l $$lang -c ${PODIR}/$$lang.${POEXT} -d ${PODIR}/$$lang; \ for filename in ${TOSHIBA}; do \ recode utf8..latin1 ${PODIR}/$$lang/$$filename.${DRIVERSEXT}; \ mv ${PODIR}/$$lang/$$filename.${DRIVERSEXT} $$filename$$lang.${DRIVERSEXT}; \ @@ -83,19 +92,21 @@ .PHONY: update update: $(patsubst %, $(PODIR)/%.$(POEXT), $(LANGUAGES)) %.po: $(SOURCE) - ./compile.sh samsung.drv lang $@ - ./compile.sh dell.drv lang $@ - ./compile.sh xerox.drv lang $@ - ./compile.sh lexmark.drv lang $@ - ./compile.sh toshiba.drv lang $@ + ./compile.sh samsung.drv.in lang $@ + ./compile.sh dell.drv.in lang $@ + ./compile.sh xerox.drv.in lang $@ + ./compile.sh lexmark.drv.in lang $@ + ./compile.sh toshiba.drv.in lang $@ cmd_install_samsung = INSTALL Samsung PPD files cmd_install_xerox = INSTALL Xerox PPD files cmd_install_dell = INSTALL Dell PPD files cmd_install_lexmark = INSTALL Lexmark PPD files cmd_install_toshiba = INSTALL Toshiba PPD files +cmd_install_drv = INSTALL DRV files .PHONY: install install: +ifneq ($(DRV_ONLY),1) $(call printCmd, $(cmd_install_samsung)) $(Q)install -d -m 755 ${DESTDIR}${CUPSPPD}/samsung $(Q)for filename in ${SAMSUNG}; do \ @@ -136,8 +147,16 @@ install -m 644 $$filename$$lang.${DRIVERSEXT} ${DESTDIR}${CUPSPPD}/toshiba;\ done; \ done; +else + $(call printCmd, $(cmd_install_drv)) + $(Q)install -d -m 755 ${DESTDIR}${CUPSDRV} + $(Q)for filename in ${DRVS}; do \ + install -m 644 $$filename ${DESTDIR}${CUPSDRV};\ + done; +endif .PHONY: clean distclean clean: distclean: $(RM) *.${DRIVERSEXT} + $(RM) *.drv diff --git a/ppd/compile.sh b/ppd/compile.sh index f4947fe..d44a3ae 100755 --- a/ppd/compile.sh +++ b/ppd/compile.sh @@ -7,7 +7,7 @@ # the content of the file where the command is located. To finish, it calls # ppdc to compile the file and generate the PPD drivers. # -# $Id: compile.sh 277 2010-07-31 17:11:24Z tillkamppeter $ +# $Id: compile.sh 306 2012-02-29 14:59:36Z tillkamppeter $ # # @@ -28,13 +28,13 @@ # # Main script # -if [ "$2" = "debug" ]; then - TMPFILE="output.drv" +if [ "$2" = "drv" ]; then DRIVER=$1 + OUTFILE=${DRIVER%.in} shift 1 - echo "" > $TMPFILE - parseFile $DRIVER $TMPFILE + echo "" > $OUTFILE + parseFile $DRIVER $OUTFILE elif [ "$2" = "lang" ]; then diff --git a/ppd/po/pt.po b/ppd/po/pt.po old file mode 100755 new file mode 100644 index b006723..b006723 100644 diff --git a/rules.mk b/rules.mk index 7f99787..8fa59f8 100644 --- a/rules.mk +++ b/rules.mk @@ -21,9 +21,9 @@ install: $(rastertoqpdl_TARGET) $(pstoqpdl_TARGET) $(Q)mkdir -p $(DESTDIR)${CUPSFILTER} $(call printCmd, $(cmd_install_raster)) - $(Q)install -m 755 -s $(rastertoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} + $(Q)install -m 755 $(rastertoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} $(call printCmd, $(cmd_install_ps)) - $(Q)install -m 755 -s $(pstoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} + $(Q)install -m 755 $(pstoqpdl_TARGET) $(DESTDIR)${CUPSFILTER} $(Q)$(MAKE) --no-print-directory -C ppd install Q=$(Q) \ DESTDIR=$(abspath $(DESTDIR)) DISABLE_JBIG=$(DISABLE_JBIG) @echo "" @@ -75,6 +75,11 @@ else BLACKOPTIMSTATE := enabled endif +ifeq ($(DRV_ONLY),0) +DRVSTATE := disabled +else +DRVSTATE := enabled +endif MSG := +---------------------------------------------+\n @@ -85,8 +90,9 @@ MSG += | CACHESIZE = %8i |\n MSG += | JBIG = %8s |\n MSG += | BLACK OPTIM = %8s |\n +MSG += | DRV ONLY = %8s |\n MSG += +---------------------------------------------+\n MSG += (Do a \"make clean\" before updating these values)\n\n optionList: @printf " $(MSG)" $(THREADSSTATE) $(THREADS) $(CACHESIZE) $(JBIGSTATE) \ - $(BLACKOPTIMSTATE) + $(BLACKOPTIMSTATE) $(DRVSTATE) diff --git a/src/algo0x0d.cpp b/src/algo0x0d.cpp index 0da54a8..5489886 100644 --- a/src/algo0x0d.cpp +++ b/src/algo0x0d.cpp @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x0d.cpp 268 2010-07-29 10:10:15Z tillkamppeter $ + * $Id: algo0x0d.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * * -- * This code is written by Leonardo Hamada diff --git a/src/algo0x0e.cpp b/src/algo0x0e.cpp old file mode 100755 new file mode 100644 index a0fbd9c..26f2e89 100644 --- a/src/algo0x0e.cpp +++ b/src/algo0x0e.cpp @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x0e.cpp 245 2008-11-24 23:00:43Z ap2c $ + * $Id: algo0x0e.cpp 303 2012-02-29 14:43:25Z tillkamppeter $ * * -- * This code is written by Leonardo Hamada diff --git a/src/algo0x11.cpp b/src/algo0x11.cpp index 2f127a2..ca4c35e 100644 --- a/src/algo0x11.cpp +++ b/src/algo0x11.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x11.cpp 284 2011-02-19 18:31:08Z tillkamppeter $ + * $Id: algo0x11.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "algo0x11.h" diff --git a/src/algo0x13.cpp b/src/algo0x13.cpp index f0cf1de..4afd6b4 100644 --- a/src/algo0x13.cpp +++ b/src/algo0x13.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x13.cpp 287 2011-02-19 19:10:22Z tillkamppeter $ + * $Id: algo0x13.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "algo0x13.h" diff --git a/src/algo0x15.cpp b/src/algo0x15.cpp index 5a60e73..b498b4f 100644 --- a/src/algo0x15.cpp +++ b/src/algo0x15.cpp @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id: algo0x15.cpp 287 2011-02-19 19:10:22Z tillkamppeter $ * -- diff --git a/src/algorithm.cpp b/src/algorithm.cpp index aba7d0b..2ca56bb 100644 --- a/src/algorithm.cpp +++ b/src/algorithm.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algorithm.cpp 119 2008-01-22 23:06:29Z ap2c $ + * $Id: algorithm.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "algorithm.h" diff --git a/src/band.cpp b/src/band.cpp index 4d0efc3..afb4fc0 100644 --- a/src/band.cpp +++ b/src/band.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: band.cpp 140 2008-01-31 18:33:18Z ap2c $ + * $Id: band.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "band.h" diff --git a/src/bandplane.cpp b/src/bandplane.cpp index 89e8a73..edf672d 100644 --- a/src/bandplane.cpp +++ b/src/bandplane.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: bandplane.cpp 257 2008-12-28 22:21:17Z ap2c $ + * $Id: bandplane.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "bandplane.h" diff --git a/src/cache.cpp b/src/cache.cpp index 1acedb4..0602630 100644 --- a/src/cache.cpp +++ b/src/cache.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: cache.cpp 200 2008-02-21 21:58:17Z ap2c $ + * $Id: cache.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #ifndef DISABLE_THREADS diff --git a/src/colors.cpp b/src/colors.cpp index 0ac7af7..5899716 100644 --- a/src/colors.cpp +++ b/src/colors.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: colors.cpp 198 2008-02-19 21:35:23Z ap2c $ + * $Id: colors.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "colors.h" diff --git a/src/compress.cpp b/src/compress.cpp index 89cd7bf..54b920c 100644 --- a/src/compress.cpp +++ b/src/compress.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: compress.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: compress.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "compress.h" diff --git a/src/core.cpp b/src/core.cpp index e3a35ca..e5e1ded 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: core.cpp 119 2008-01-22 23:06:29Z ap2c $ + * $Id: core.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "core.h" diff --git a/src/document.cpp b/src/document.cpp index eb7827e..928bfd7 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: document.cpp 256 2008-11-30 14:20:22Z ap2c $ + * $Id: document.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "document.h" diff --git a/src/page.cpp b/src/page.cpp index 9d36298..60e5930 100644 --- a/src/page.cpp +++ b/src/page.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: page.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: page.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "page.h" diff --git a/src/ppdfile.cpp b/src/ppdfile.cpp index d6a6439..fdd157f 100644 --- a/src/ppdfile.cpp +++ b/src/ppdfile.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ppdfile.cpp 273 2010-07-29 15:34:19Z tillkamppeter $ + * $Id: ppdfile.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "ppdfile.h" diff --git a/src/printer.cpp b/src/printer.cpp index 0ae996a..b1c6b5c 100644 --- a/src/printer.cpp +++ b/src/printer.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: printer.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: printer.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "printer.h" diff --git a/src/pstoqpdl.cpp b/src/pstoqpdl.cpp index 10b4dcd..c9e4e10 100644 --- a/src/pstoqpdl.cpp +++ b/src/pstoqpdl.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: pstoqpdl.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: pstoqpdl.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "ppdfile.h" diff --git a/src/qpdl.cpp b/src/qpdl.cpp index 9b6c13f..994e1c8 100644 --- a/src/qpdl.cpp +++ b/src/qpdl.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: qpdl.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: qpdl.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "qpdl.h" diff --git a/src/rastertoqpdl.cpp b/src/rastertoqpdl.cpp index 44f0c7c..9e7717b 100644 --- a/src/rastertoqpdl.cpp +++ b/src/rastertoqpdl.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: rastertoqpdl.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: rastertoqpdl.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include diff --git a/src/rendering.cpp b/src/rendering.cpp index fafdd36..3d40e16 100644 --- a/src/rendering.cpp +++ b/src/rendering.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: rendering.cpp 298 2011-07-20 16:20:18Z tillkamppeter $ + * $Id: rendering.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "rendering.h" diff --git a/src/request.cpp b/src/request.cpp index 609dfae..da7f3e4 100644 --- a/src/request.cpp +++ b/src/request.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: request.cpp 183 2008-02-09 15:24:43Z ap2c $ + * $Id: request.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "request.h" diff --git a/src/semaphore.cpp b/src/semaphore.cpp index b867cb6..a4c6e8e 100644 --- a/src/semaphore.cpp +++ b/src/semaphore.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: semaphore.cpp 139 2008-01-31 16:48:23Z ap2c $ + * $Id: semaphore.cpp 301 2012-02-29 14:11:09Z tillkamppeter $ * */ #include "semaphore.h" diff --git a/tools/algo0x11.cpp b/tools/algo0x11.cpp index 5c512d0..233b908 100644 --- a/tools/algo0x11.cpp +++ b/tools/algo0x11.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x11.cpp 98 2007-10-19 00:41:07Z ap2c $ + * $Id: algo0x11.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "algo0x11.h" #include diff --git a/tools/algo0x11.h b/tools/algo0x11.h index 40add37..08d51e0 100644 --- a/tools/algo0x11.h +++ b/tools/algo0x11.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: algo0x11.h 95 2007-10-18 23:35:36Z ap2c $ + * $Id: algo0x11.h 302 2012-02-29 14:18:29Z tillkamppeter $ */ #ifndef _ALGO0X11_H_ #define _ALGO0X11_H_ diff --git a/tools/appliargs.cpp b/tools/appliargs.cpp index 5a481d4..bc4c67f 100644 --- a/tools/appliargs.cpp +++ b/tools/appliargs.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id: appliargs.cpp 94 2007-10-17 23:46:38Z ap2c $ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id: appliargs.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "appliargs.h" #include diff --git a/tools/appliargs.h b/tools/appliargs.h index 1d3490d..febda40 100644 --- a/tools/appliargs.h +++ b/tools/appliargs.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: appliargs.h 98 2007-10-19 00:41:07Z ap2c $ + * $Id: appliargs.h 302 2012-02-29 14:18:29Z tillkamppeter $ */ #ifndef _APPLIARGS_H_ #define _APPLIARGS_H_ diff --git a/tools/decompress.cpp b/tools/decompress.cpp index ff870ba..f47534e 100644 --- a/tools/decompress.cpp +++ b/tools/decompress.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: decompress.cpp 95 2007-10-18 23:35:36Z ap2c $ + * $Id: decompress.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "appliargs.h" #include diff --git a/tools/i18n.h b/tools/i18n.h index a620283..1615eb0 100644 --- a/tools/i18n.h +++ b/tools/i18n.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: i18n.h 94 2007-10-17 23:46:38Z ap2c $ + * $Id: i18n.h 302 2012-02-29 14:18:29Z tillkamppeter $ */ #ifndef _I18N_H_ #define _I18N_H_ diff --git a/tools/jbgtopbm.cpp b/tools/jbgtopbm.cpp index 7ffe4ca..c76ca97 100644 --- a/tools/jbgtopbm.cpp +++ b/tools/jbgtopbm.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: jbgtopbm.cpp 106 2007-11-16 02:23:20Z ap2c $ + * $Id: jbgtopbm.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "appliargs.h" #include diff --git a/tools/page.cpp b/tools/page.cpp index 289014e..34cb220 100644 --- a/tools/page.cpp +++ b/tools/page.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id: page.cpp 160 2008-02-09 02:08:33Z ap2c $ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id: page.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "page.h" #include diff --git a/tools/page.h b/tools/page.h index 9ed3eba..240c7bb 100644 --- a/tools/page.h +++ b/tools/page.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: page.h 106 2007-11-16 02:23:20Z ap2c $ + * $Id: page.h 302 2012-02-29 14:18:29Z tillkamppeter $ */ #ifndef _PAGE_H_ #define _PAGE_H_ diff --git a/tools/pjl.cpp b/tools/pjl.cpp index 22c4241..298f097 100644 --- a/tools/pjl.cpp +++ b/tools/pjl.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: pjl.cpp 94 2007-10-17 23:46:38Z ap2c $ + * $Id: pjl.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "pjl.h" #include diff --git a/tools/pjl.h b/tools/pjl.h index b16a961..f0360f3 100644 --- a/tools/pjl.h +++ b/tools/pjl.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: pjl.h 94 2007-10-17 23:46:38Z ap2c $ + * $Id: pjl.h 302 2012-02-29 14:18:29Z tillkamppeter $ */ #ifndef _PJL_H_ #define _PJL_H_ diff --git a/tools/qpdl.cpp b/tools/qpdl.cpp index 813dfd4..1ae6bb1 100644 --- a/tools/qpdl.cpp +++ b/tools/qpdl.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: qpdl.cpp 231 2008-10-19 13:16:24Z ap2c $ + * $Id: qpdl.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ #include "qpdl.h" #include diff --git a/tools/qpdl.h b/tools/qpdl.h index f2d9dc9..7484d2d 100644 --- a/tools/qpdl.h +++ b/tools/qpdl.h @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: qpdl.h 95 2007-10-18 23:35:36Z ap2c $ + * $Id: qpdl.h 302 2012-02-29 14:18:29Z tillkamppeter $ */ #ifndef _QPDL_H_ #define _QPDL_H_ diff --git a/tools/template.cpp b/tools/template.cpp index da7fe85..f060fb9 100644 --- a/tools/template.cpp +++ b/tools/template.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: template.cpp 94 2007-10-17 23:46:38Z ap2c $ + * $Id: template.cpp 302 2012-02-29 14:18:29Z tillkamppeter $ */ /* vim: set expandtab tabstop=4 shiftwidth=4 smarttab tw=80 cin enc=utf8 : */