← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to debian/patches/remove-duplicate-entry-for-cp1700-in-drv-files.dpatch

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
http://bugs.debian.org/683033
http://bugs.debian.org/687129
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/remove-duplicate-entry-for-cp1700-in-drv-files.dpatch
5
5
## DP: No description.
6
6
 
7
7
@DPATCH@
8
 
diff -urNad hplip-3.10.2~/prnt/drv/hpcups.drv.in hplip-3.10.2/prnt/drv/hpcups.drv.in
9
 
--- hplip-3.10.2~/prnt/drv/hpcups.drv.in        2010-04-11 09:58:07.000000000 +0200
10
 
+++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-11 10:01:29.285465160 +0200
11
 
@@ -1626,14 +1626,6 @@
 
8
Index: hplip-3.12.4/prnt/drv/hpcups.drv.in
 
9
===================================================================
 
10
--- hplip-3.12.4.orig/prnt/drv/hpcups.drv.in    2012-04-10 18:38:29.000000000 +1000
 
11
+++ hplip-3.12.4/prnt/drv/hpcups.drv.in 2012-05-26 10:21:29.000000000 +1000
 
12
@@ -1672,14 +1672,6 @@
12
13
       Attribute "Product" "" "(HP Photosmart 1315 Printer)"
13
14
     }
14
15
     {
23
24
       ModelName "HP PSC 2100 Series"
24
25
       Attribute "NickName" "" "HP PSC 2100 Series, $Version"
25
26
       Attribute "ShortNickName" "" "HP PSC 2100 Series"
26
 
@@ -1741,11 +1733,11 @@
 
27
@@ -1787,11 +1779,11 @@
27
28
 
28
29
     // <%DJ9xxVIP:LargeFormatSuperB%>
29
30
     {
40
41
       Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
41
42
       Attribute "Product" "" "(HP Color Inkjet cp1700ps Printer)"
42
43
       Attribute "Product" "" "(HP Color Inkjet cp1700d Printer)"
43
 
diff -urNad hplip-3.10.2~/prnt/drv/hpijs.drv.in hplip-3.10.2/prnt/drv/hpijs.drv.in
44
 
--- hplip-3.10.2~/prnt/drv/hpijs.drv.in 2010-04-11 09:58:07.000000000 +0200
45
 
+++ hplip-3.10.2/prnt/drv/hpijs.drv.in  2010-04-11 10:00:39.616713799 +0200
46
 
@@ -1744,14 +1744,6 @@
 
44
Index: hplip-3.12.4/prnt/drv/hpijs.drv.in
 
45
===================================================================
 
46
--- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in     2012-04-10 18:38:30.000000000 +1000
 
47
+++ hplip-3.12.4/prnt/drv/hpijs.drv.in  2012-05-26 10:23:43.000000000 +1000
 
48
@@ -1745,14 +1745,6 @@
47
49
     Attribute "Product" "" "(HP Photosmart 1315 Printer)"
48
50
   }
49
51
   {
58
60
     ModelName "HP PSC 2100 Series hpijs"
59
61
     Attribute "NickName" "" "HP PSC 2100 Series hpijs, $Version"
60
62
     Attribute "ShortNickName" "" "HP PSC 2100 Series hpijs"
61
 
@@ -1833,11 +1825,11 @@
 
63
@@ -1834,11 +1826,11 @@
62
64
     CustomMedia "A3/A3" 842.00 1190.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A3" "%% FoomaticRIPOptionSetting: PageSize=A3"
63
65
     // <%DJ9xxVIP:LargeFormatSuperB%>
64
66
     {