diff -u gutenprint-5.2.5/debian/changelog gutenprint-5.2.5/debian/changelog --- gutenprint-5.2.5/debian/changelog +++ gutenprint-5.2.5/debian/changelog @@ -1,3 +1,10 @@ +gutenprint (5.2.5-0ubuntu1.1) lucid-proposed; urgency=low + + * debian/patches/S20-S21-T20-T21-regression.dpatch: Fix regression of + Epson Stylus S20, S21, T20, and T21 not working any more (LP: #576705). + + -- Till Kamppeter Mon, 19 Jul 2010 17:21:35 +0200 + gutenprint (5.2.5-0ubuntu1) lucid; urgency=low * New upstream release diff -u gutenprint-5.2.5/debian/patches/series gutenprint-5.2.5/debian/patches/series --- gutenprint-5.2.5/debian/patches/series +++ gutenprint-5.2.5/debian/patches/series @@ -1,0 +2 @@ +S20-S21-T20-T21-regression.dpatch only in patch2: unchanged: --- gutenprint-5.2.5.orig/debian/patches/S20-S21-T20-T21-regression.dpatch +++ gutenprint-5.2.5/debian/patches/S20-S21-T20-T21-regression.dpatch @@ -0,0 +1,230 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## S20-S21-T20-T21-regression.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gutenprint-5.2.5-1ubuntu1~/src/xml/escp2/model/Makefile.am gutenprint-5.2.5-1ubuntu1/src/xml/escp2/model/Makefile.am +--- gutenprint-5.2.5-1ubuntu1~/src/xml/escp2/model/Makefile.am 2010-05-05 09:32:26.000000000 +0200 ++++ gutenprint-5.2.5-1ubuntu1/src/xml/escp2/model/Makefile.am 2010-07-19 12:42:37.419680986 +0200 +@@ -126,6 +126,7 @@ + model_97.xml \ + model_98.xml \ + model_99.xml \ ++ model_101.xml \ + model_100.xml + + xml-stamp: $(pkgxmldata_DATA) Makefile.am +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gutenprint-5.2.5-1ubuntu1~/src/xml/escp2/model/model_101.xml gutenprint-5.2.5-1ubuntu1/src/xml/escp2/model/model_101.xml +--- gutenprint-5.2.5-1ubuntu1~/src/xml/escp2/model/model_101.xml 1970-01-01 01:00:00.000000000 +0100 ++++ gutenprint-5.2.5-1ubuntu1/src/xml/escp2/model/model_101.xml 2010-07-19 12:42:23.919684348 +0200 +@@ -0,0 +1,183 @@ ++ ++ ++ ++ ++ * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu) ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the Free ++ * Software Foundation; either version 2 of the License, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of 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. ++ ++ ++ ++ ++ ++ ++ ++ US\003\000\000\000\002 ++ \000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@ ++ JS\014\000\000GUTENPRINT\000PM\002\000\000\000 ++ JE\001\000\000 ++ 2000 ++ Yes ++ ++ ++ ++ ++ Portrait ++ ++ 29 ++ 30 ++ 1 ++ 3 ++ ++ ++ 90 ++ 90 ++ 0 ++ 3 ++ ++ ++ 90 ++ 90 ++ 0 ++ 3 ++ ++ 4 ++ 360 ++ 14400 ++ 360 120 ++ 5760 2880 ++ 10 ++ 1 ++ 80 ++ -180 ++ 42 ++ 1 ++ 28800 ++ 16588800 ++ 144 144 ++ 612 86400 ++ 612 86400 ++ 9 9 0 9 ++ 9 9 0 9 ++ 9 9 0 0 ++ 9 9 0 0 ++ 24 ++ 204 191 ++ 595 842 ++ 4 15 0 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ 360 120 ++ 4.000000 ++ 16 ++ 360 ++ 2 ++ 0.200000 ++ 0.350000 ++ 1.000000 ++ ++ ++ 360 360 ++ 2.000000 ++ 16 ++ 360 ++ 2 ++ 0.200000 ++ 0.350000 ++ 1.000000 ++ ++ ++ 720 360 ++ 1.560000 ++ 17 ++ 360 ++ 2 ++ 0.300000 ++ 0.660000 ++ 1.000000 ++ ++ ++ 720 720 ++ 0.780000 ++ 17 ++ 360 ++ 2 ++ 0.300000 ++ 0.550000 ++ 1.000000 ++ ++ ++ 1440 720 ++ 0.778000 ++ 18 ++ 360 ++ 2 ++ 0.380000 ++ 0.500000 ++ 1.000000 ++ ++ ++ 2880 1440 ++ 1440 1440 ++ 0.512000 ++ 18 ++ 360 ++ 2 ++ 0.500000 ++ 1.000000 ++ ++ ++ 2880 1440 ++ 0.512 ++ 18 ++ 360 ++ 2 ++ 1.000000 ++ ++ ++ 5760 1440 ++ 0.256000 ++ 18 ++ 360 ++ 2 ++ 1.000000 ++ ++ ++ 2880 2880 ++ 0.256000 ++ 18 ++ 360 ++ 2 ++ 1.000000 ++ ++ ++ 5760 2880 ++ 0.128000 ++ 18 ++ 360 ++ 2 ++ 1.000000 ++ ++ ++ ++ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gutenprint-5.2.5-1ubuntu1~/src/xml/printers.xml gutenprint-5.2.5-1ubuntu1/src/xml/printers.xml +--- gutenprint-5.2.5-1ubuntu1~/src/xml/printers.xml 2010-05-05 09:32:24.000000000 +0200 ++++ gutenprint-5.2.5-1ubuntu1/src/xml/printers.xml 2010-07-19 12:41:42.709694541 +0200 +@@ -468,8 +468,8 @@ + + + +- +- ++ ++ + + + +@@ -489,8 +489,8 @@ + + + +- +- ++ ++ + + +