subject:"\[arch\-commits\] Commit in hplip\/repos \(8 files\)"

[arch-commits] Commit in hplip/repos (8 files)

2020-11-12 Thread Evangelos Foutras via arch-commits

Date: Thursday, November 12, 2020 @ 19:33:44
  Author: foutrelis
Revision: 400707

archrelease: copy trunk to staging-x86_64

Added:
  hplip/repos/staging-x86_64/
  
hplip/repos/staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 400706, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  
hplip/repos/staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(from rev 400706, 
hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
  
hplip/repos/staging-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
(from rev 400706, 
hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch)
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 400706, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/disable_upgrade.patch
(from rev 400706, hplip/trunk/disable_upgrade.patch)
  hplip/repos/staging-x86_64/python3.diff
(from rev 400706, hplip/trunk/python3.diff)
  hplip/repos/staging-x86_64/reproducible-gzip.patch
(from rev 400706, hplip/trunk/reproducible-gzip.patch)

-+
 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch |   50 +++
 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch   |   29 +
 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch |  113 +++
 PKGBUILD|  106 +++
 disable_upgrade.patch   |   14 
 python3.diff|  147 
++
 reproducible-gzip.patch |   38 ++
 7 files changed, 497 insertions(+)

Copied: 
hplip/repos/staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 400706, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch  
(rev 0)
+++ 
staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch  
2020-11-12 19:33:44 UTC (rev 400707)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: 
hplip/repos/staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
 (from rev 400706, 
hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
===
--- staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(rev 0)
+++ staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
2020-11-12 19:33:44 UTC (rev 400707)
@@ -0,0 +1,29 @@
+From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001
+From: Gaurav Sood 
+Date: Thu, 4 May 2017 18:32:08 +0200
+Subject: Fix handling of unicode filenames in sixext.py
+
+LP: #1480152
+Closes: #861731
+---
+ base/sixext.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/sixext.py b/base/sixext.py
+index 0bf4fc4f4..311bf72c6 100644
+--- a/base/sixext.py
 b/ba

[arch-commits] Commit in hplip/repos (8 files)

2020-10-27 Thread Felix Yan via arch-commits

Date: Tuesday, October 27, 2020 @ 10:12:52
  Author: felixonmars
Revision: 398853

archrelease: copy trunk to staging-x86_64

Added:
  hplip/repos/staging-x86_64/
  
hplip/repos/staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 398852, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  
hplip/repos/staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(from rev 398852, 
hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
  
hplip/repos/staging-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
(from rev 398852, 
hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch)
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 398852, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/disable_upgrade.patch
(from rev 398852, hplip/trunk/disable_upgrade.patch)
  hplip/repos/staging-x86_64/python3.diff
(from rev 398852, hplip/trunk/python3.diff)
  hplip/repos/staging-x86_64/reproducible-gzip.patch
(from rev 398852, hplip/trunk/reproducible-gzip.patch)

-+
 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch |   50 +++
 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch   |   29 +
 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch |  113 +++
 PKGBUILD|  106 +++
 disable_upgrade.patch   |   14 
 python3.diff|  147 
++
 reproducible-gzip.patch |   38 ++
 7 files changed, 497 insertions(+)

Copied: 
hplip/repos/staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 398852, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch  
(rev 0)
+++ 
staging-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch  
2020-10-27 10:12:52 UTC (rev 398853)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: 
hplip/repos/staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
 (from rev 398852, 
hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
===
--- staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(rev 0)
+++ staging-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
2020-10-27 10:12:52 UTC (rev 398853)
@@ -0,0 +1,29 @@
+From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001
+From: Gaurav Sood 
+Date: Thu, 4 May 2017 18:32:08 +0200
+Subject: Fix handling of unicode filenames in sixext.py
+
+LP: #1480152
+Closes: #861731
+---
+ base/sixext.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/sixext.py b/base/sixext.py
+index 0bf4fc4f4..311bf72c6 100644
+--- a/base/sixext.py
 b/ba

[arch-commits] Commit in hplip/repos (8 files)

2020-10-04 Thread Andreas Radke via arch-commits

Date: Sunday, October 4, 2020 @ 17:43:18
  Author: andyrtr
Revision: 397244

archrelease: copy trunk to testing-x86_64

Added:
  hplip/repos/testing-x86_64/
  
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 397243, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  
hplip/repos/testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(from rev 397243, 
hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
  
hplip/repos/testing-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
(from rev 397243, 
hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 397243, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 397243, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/python3.diff
(from rev 397243, hplip/trunk/python3.diff)
  hplip/repos/testing-x86_64/reproducible-gzip.patch
(from rev 397243, hplip/trunk/reproducible-gzip.patch)

-+
 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch |   50 +++
 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch   |   29 +
 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch |  113 +++
 PKGBUILD|  106 +++
 disable_upgrade.patch   |   14 
 python3.diff|  147 
++
 reproducible-gzip.patch |   38 ++
 7 files changed, 497 insertions(+)

Copied: 
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 397243, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch  
(rev 0)
+++ 
testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch  
2020-10-04 17:43:18 UTC (rev 397244)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: 
hplip/repos/testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
 (from rev 397243, 
hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
===
--- testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(rev 0)
+++ testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
2020-10-04 17:43:18 UTC (rev 397244)
@@ -0,0 +1,29 @@
+From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001
+From: Gaurav Sood 
+Date: Thu, 4 May 2017 18:32:08 +0200
+Subject: Fix handling of unicode filenames in sixext.py
+
+LP: #1480152
+Closes: #861731
+---
+ base/sixext.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/sixext.py b/base/sixext.py
+index 0bf4fc4f4..311bf72c6 100644
+--- a/base/sixext.py
 b/base/six

[arch-commits] Commit in hplip/repos (8 files)

2017-10-30 Thread Andreas Radke

Date: Monday, October 30, 2017 @ 16:16:49
  Author: andyrtr
Revision: 308673

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 308672, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-i686/PKGBUILD
(from rev 308672, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/disable_upgrade.patch
(from rev 308672, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/
  
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 308672, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 308672, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 308672, hplip/trunk/disable_upgrade.patch)

+
 testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch   
|   50 +
 testing-i686/PKGBUILD  
|   92 ++
 testing-i686/disable_upgrade.patch 
|   14 +
 testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 
|   50 +
 testing-x86_64/PKGBUILD
|   92 ++
 testing-x86_64/disable_upgrade.patch   
|   14 +
 6 files changed, 312 insertions(+)

Copied: 
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 308672, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++ 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2017-10-30 16:16:49 UTC (rev 308673)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 308672, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-10-30 16:16:49 UTC (rev 308673)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.17.10
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'sane: for scanner support'
+'xsane: sane scanner frontend'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-s

[arch-commits] Commit in hplip/repos (8 files)

2017-10-05 Thread Andreas Radke

Date: Thursday, October 5, 2017 @ 17:46:22
  Author: andyrtr
Revision: 306850

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 306849, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-i686/PKGBUILD
(from rev 306849, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/disable_upgrade.patch
(from rev 306849, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/
  
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 306849, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 306849, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 306849, hplip/trunk/disable_upgrade.patch)

+
 testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch   
|   50 +
 testing-i686/PKGBUILD  
|   92 ++
 testing-i686/disable_upgrade.patch 
|   14 +
 testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 
|   50 +
 testing-x86_64/PKGBUILD
|   92 ++
 testing-x86_64/disable_upgrade.patch   
|   14 +
 6 files changed, 312 insertions(+)

Copied: 
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 306849, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++ 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2017-10-05 17:46:22 UTC (rev 306850)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 306849, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-10-05 17:46:22 UTC (rev 306850)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.17.9
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'sane: for scanner support'
+'xsane: sane scanner frontend'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-s

[arch-commits] Commit in hplip/repos (8 files)

2017-08-03 Thread Andreas Radke

Date: Thursday, August 3, 2017 @ 16:12:54
  Author: andyrtr
Revision: 301564

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 301563, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-i686/PKGBUILD
(from rev 301563, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/disable_upgrade.patch
(from rev 301563, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/
  
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 301563, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 301563, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 301563, hplip/trunk/disable_upgrade.patch)

+
 testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch   
|   50 +
 testing-i686/PKGBUILD  
|   92 ++
 testing-i686/disable_upgrade.patch 
|   14 +
 testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 
|   50 +
 testing-x86_64/PKGBUILD
|   92 ++
 testing-x86_64/disable_upgrade.patch   
|   14 +
 6 files changed, 312 insertions(+)

Copied: 
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 301563, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++ 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2017-08-03 16:12:54 UTC (rev 301564)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 301563, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-08-03 16:12:54 UTC (rev 301564)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.17.7
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'sane: for scanner support'
+'xsane: sane scanner frontend'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-sc

[arch-commits] Commit in hplip/repos (8 files)

2017-06-25 Thread Andreas Radke

Date: Sunday, June 25, 2017 @ 16:05:49
  Author: andyrtr
Revision: 299222

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 299221, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-i686/PKGBUILD
(from rev 299221, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/disable_upgrade.patch
(from rev 299221, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/
  
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 299221, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 299221, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 299221, hplip/trunk/disable_upgrade.patch)

+
 testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch   
|   50 +
 testing-i686/PKGBUILD  
|   92 ++
 testing-i686/disable_upgrade.patch 
|   14 +
 testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 
|   50 +
 testing-x86_64/PKGBUILD
|   92 ++
 testing-x86_64/disable_upgrade.patch   
|   14 +
 6 files changed, 312 insertions(+)

Copied: 
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 299221, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++ 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2017-06-25 16:05:49 UTC (rev 299222)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 299221, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-06-25 16:05:49 UTC (rev 299222)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.17.6
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'sane: for scanner support'
+'xsane: sane scanner frontend'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-scan'

[arch-commits] Commit in hplip/repos (8 files)

2017-06-08 Thread Andreas Radke

Date: Thursday, June 8, 2017 @ 13:00:35
  Author: andyrtr
Revision: 298389

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 298388, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-i686/PKGBUILD
(from rev 298388, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/disable_upgrade.patch
(from rev 298388, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/
  
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 298388, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 298388, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 298388, hplip/trunk/disable_upgrade.patch)

+
 testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch   
|   50 +
 testing-i686/PKGBUILD  
|   92 ++
 testing-i686/disable_upgrade.patch 
|   14 +
 testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 
|   50 +
 testing-x86_64/PKGBUILD
|   92 ++
 testing-x86_64/disable_upgrade.patch   
|   14 +
 6 files changed, 312 insertions(+)

Copied: 
hplip/repos/testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 (from rev 298388, 
hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===
--- 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(rev 0)
+++ 
testing-i686/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
2017-06-08 13:00:35 UTC (rev 298389)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter 
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include ' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in   | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
 b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], 
[AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel 
support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find 
cups-devel support], 3)])
+if test "$libusb01_build" = "yes"; then
+   AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot 
find libusb support], 2)])
+   AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel 
support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
 b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include 
++
+ #define   DBITMAPFILEHEADER   14
+ #define   DBITMAPINFOHEADER   40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
 b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef FALSE

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 298388, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-06-08 13:00:35 UTC (rev 298389)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.17.6
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'sane: for scanner support'
+'xsane: sane scanner frontend'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-scan

[arch-commits] Commit in hplip/repos (8 files)

2016-08-29 Thread Andreas Radke

Date: Monday, August 29, 2016 @ 19:22:56
  Author: andyrtr
Revision: 274826

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 274825, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/disable_upgrade.patch
(from rev 274825, hplip/trunk/disable_upgrade.patch)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 274825, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/disable_upgrade.patch
(from rev 274825, hplip/trunk/disable_upgrade.patch)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/disable_upgrade.patch
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/disable_upgrade.patch

+
 /PKGBUILD  |  172 +++
 /disable_upgrade.patch |   28 +
 extra-i686/PKGBUILD|   86 -
 extra-i686/disable_upgrade.patch   |   14 --
 extra-x86_64/PKGBUILD  |   86 -
 extra-x86_64/disable_upgrade.patch |   14 --
 6 files changed, 200 insertions(+), 200 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-08-29 19:22:46 UTC (rev 274825)
+++ extra-i686/PKGBUILD 2016-08-29 19:22:56 UTC (rev 274826)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.16.7
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
-'sane: for scanner support'
-'xsane: sane scanner frontend'
-'python-pillow: for commandline scanning support'
-'python-reportlab: for pdf output in hp-scan'
-'rpcbind: for network support'
-'python-pyqt5: for running GUI and hp-toolbox'
-'python-gobject: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices (AUR) or run 
hp-setup to download the plugin'
-'libusb: for advanced usb support')
-backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-disable_upgrade.patch)
-sha1sums=('9d2efbdf80c9df96a7933efca95fd9fa3778d4f2'
-  'SKIP'
-  '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
-
-prepare() {
- cd $pkgname-$pkgver
- 
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i ${srcdir}/disable_upgrade.patch
- 
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-   local i
-   for i in ppd/hpijs/*.ppd.gz ; do
-   rm -f ${i}.temp
-   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-   gzip > ${i}.temp || return 1
-   mv ${i}.temp ${i}
-   done
-   
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-qt5 \
- --disable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build #--help
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- 
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- install -dm755 ${pkgdir}/etc/sane.d/dll.d
- echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
- 
- # remove HAL .fdi file because HAL is no longer used
- rm -vrf "$pkgdir"/usr/share/hal
- 
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 274825, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-08-29 19:22:56 UTC (rev 274826)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.16.8
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart,

[arch-commits] Commit in hplip/repos (8 files)

2016-07-22 Thread Andreas Radke

Date: Friday, July 22, 2016 @ 16:47:56
  Author: andyrtr
Revision: 272123

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 272122, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/disable_upgrade.patch
(from rev 272122, hplip/trunk/disable_upgrade.patch)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 272122, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/disable_upgrade.patch
(from rev 272122, hplip/trunk/disable_upgrade.patch)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/disable_upgrade.patch
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/disable_upgrade.patch

+
 /PKGBUILD  |  172 +++
 /disable_upgrade.patch |   28 +
 extra-i686/PKGBUILD|   86 -
 extra-i686/disable_upgrade.patch   |   14 --
 extra-x86_64/PKGBUILD  |   86 -
 extra-x86_64/disable_upgrade.patch |   14 --
 6 files changed, 200 insertions(+), 200 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-07-22 16:47:40 UTC (rev 272122)
+++ extra-i686/PKGBUILD 2016-07-22 16:47:56 UTC (rev 272123)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke 
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.16.5
-pkgrel=3
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python-dbus' 'ghostscript' 'net-snmp' 'wget' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
-optdepends=('cups: for printing support'
-'sane: for scanner support'
-'xsane: sane scanner frontend'
-'python-pillow: for commandline scanning support'
-'python-reportlab: for pdf output in hp-scan'
-'rpcbind: for network support'
-'python-pyqt5: for running GUI and hp-toolbox'
-'python-gobject: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices (AUR) or run 
hp-setup to download the plugin'
-'libusb: for advanced usb support')
-backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-disable_upgrade.patch)
-sha1sums=('59264a6668ab37871fd007fcee70d4932f11f9d7'
-  'SKIP'
-  '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
-validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
-
-prepare() {
- cd $pkgname-$pkgver
- 
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i ${srcdir}/disable_upgrade.patch
- 
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-   local i
-   for i in ppd/hpijs/*.ppd.gz ; do
-   rm -f ${i}.temp
-   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-   gzip > ${i}.temp || return 1
-   mv ${i}.temp ${i}
-   done
-   
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-qt5 \
- --disable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build #--help
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- 
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- install -dm755 ${pkgdir}/etc/sane.d/dll.d
- echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
- 
- # remove HAL .fdi file because HAL is no longer used
- rm -vrf "$pkgdir"/usr/share/hal
- 
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 272122, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-07-22 16:47:56 UTC (rev 272123)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.16.7
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Bu

[arch-commits] Commit in hplip/repos (8 files)

2015-12-06 Thread Bartłomiej Piotrowski

Date: Monday, December 7, 2015 @ 02:28:43
  Author: bpiotrowski
Revision: 253148

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  hplip/repos/staging-i686/
  hplip/repos/staging-i686/PKGBUILD
(from rev 253147, hplip/trunk/PKGBUILD)
  hplip/repos/staging-i686/disable_upgrade.patch
(from rev 253147, hplip/trunk/disable_upgrade.patch)
  hplip/repos/staging-i686/hplip.install
(from rev 253147, hplip/trunk/hplip.install)
  hplip/repos/staging-x86_64/
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 253147, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/disable_upgrade.patch
(from rev 253147, hplip/trunk/disable_upgrade.patch)
  hplip/repos/staging-x86_64/hplip.install
(from rev 253147, hplip/trunk/hplip.install)

--+
 staging-i686/PKGBUILD|   84 +
 staging-i686/disable_upgrade.patch   |   14 +
 staging-i686/hplip.install   |   18 +++
 staging-x86_64/PKGBUILD  |   84 +
 staging-x86_64/disable_upgrade.patch |   14 +
 staging-x86_64/hplip.install |   18 +++
 6 files changed, 232 insertions(+)

Copied: hplip/repos/staging-i686/PKGBUILD (from rev 253147, 
hplip/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-12-07 01:28:43 UTC (rev 253148)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.15.11
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 
'foomatic-db-engine')
+makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'python-dbus: for dbus support'
+'sane: for scanner support'
+'xsane: sane scanner frontend'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-scan'
+'rpcbind: for network support'
+'python-pyqt4: for running GUI and hp-toolbox'
+'python-gobject: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices (AUR) or run 
hp-setup to download the plugin'
+'libusb: for advanced usb support')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+disable_upgrade.patch)
+sha1sums=('c28f373e85a1355c10c3112e1274138372a9c832'
+  'SKIP'
+  '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
+
+prepare() {
+ cd $pkgname-$pkgver
+ 
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ 
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ 
+ # remove HAL .fdi file because HAL is no longer used
+ rm -vrf "$pkgdir"/usr/share/hal
+ 
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+}

Copied: hplip/repos/staging-i686/disable_upgrade.patch (from rev 253147, 
hplip/trunk/disable_upgrade.patch)
===
--- staging-i686/disable_upgrade.patch  (rev 0)
+++ staging-i686/disable_upgrade.patch  2015-12-07 01:28:43 UTC (rev 253148)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig2013-10-31 12:46:54.0 +0100
 upgrade.py 2013-12-04 14:58:03.0 +0100
+@

[arch-commits] Commit in hplip/repos (8 files)

2015-09-21 Thread Felix Yan

Date: Tuesday, September 22, 2015 @ 06:37:33
  Author: fyan
Revision: 247059

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  hplip/repos/staging-i686/
  hplip/repos/staging-i686/PKGBUILD
(from rev 247058, hplip/trunk/PKGBUILD)
  hplip/repos/staging-i686/disable_upgrade.patch
(from rev 247058, hplip/trunk/disable_upgrade.patch)
  hplip/repos/staging-i686/hplip.install
(from rev 247058, hplip/trunk/hplip.install)
  hplip/repos/staging-x86_64/
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 247058, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/disable_upgrade.patch
(from rev 247058, hplip/trunk/disable_upgrade.patch)
  hplip/repos/staging-x86_64/hplip.install
(from rev 247058, hplip/trunk/hplip.install)

--+
 staging-i686/PKGBUILD|   83 +
 staging-i686/disable_upgrade.patch   |   14 +
 staging-i686/hplip.install   |   18 +++
 staging-x86_64/PKGBUILD  |   83 +
 staging-x86_64/disable_upgrade.patch |   14 +
 staging-x86_64/hplip.install |   18 +++
 6 files changed, 230 insertions(+)

Copied: hplip/repos/staging-i686/PKGBUILD (from rev 247058, 
hplip/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-09-22 04:37:33 UTC (rev 247059)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.15.9
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 
'foomatic-db-engine')
+makedepends=('python-pyqt4' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'python-dbus: for dbus support'
+'sane: for scanner support'
+'python-pillow: for commandline scanning support'
+'python-reportlab: for pdf output in hp-scan'
+'rpcbind: for network support'
+'python-pyqt4: for running GUI and hp-toolbox'
+'python-gobject: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices (AUR) or run 
hp-setup to download the plugin'
+'libusb: for advanced usb support')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+disable_upgrade.patch)
+sha1sums=('564a37d39269fee9c938b7fe9f2b31c4f9c4db06'
+  'SKIP'
+  '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
+
+prepare() {
+ cd $pkgname-$pkgver
+ 
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ 
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ 
+ # remove HAL .fdi file because HAL is no longer used
+ rm -vrf "$pkgdir"/usr/share/hal
+ 
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+}

Copied: hplip/repos/staging-i686/disable_upgrade.patch (from rev 247058, 
hplip/trunk/disable_upgrade.patch)
===
--- staging-i686/disable_upgrade.patch  (rev 0)
+++ staging-i686/disable_upgrade.patch  2015-09-22 04:37:33 UTC (rev 247059)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig2013-10-31 12:46:54.0 +0100
 upgrade.py 2013-12-04 14:58:03.0 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:

[arch-commits] Commit in hplip/repos (8 files)

2015-02-05 Thread Andreas Radke

Date: Thursday, February 5, 2015 @ 21:50:02
  Author: andyrtr
Revision: 230855

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 230854, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/disable_upgrade.patch
(from rev 230854, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-i686/hplip.install
(from rev 230854, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 230854, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 230854, hplip/trunk/disable_upgrade.patch)
  hplip/repos/testing-x86_64/hplip.install
(from rev 230854, hplip/trunk/hplip.install)

--+
 testing-i686/PKGBUILD|   97 +
 testing-i686/disable_upgrade.patch   |   14 
 testing-i686/hplip.install   |   18 ++
 testing-x86_64/PKGBUILD  |   97 +
 testing-x86_64/disable_upgrade.patch |   14 
 testing-x86_64/hplip.install |   18 ++
 6 files changed, 258 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 230854, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-02-05 20:50:02 UTC (rev 230855)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Andreas Radke 
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.15.2
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 
'foomatic-db-engine')
+makedepends=('python-pyqt4' 'python-gobject2' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+'python-dbus: for dbus support'
+'sane: for scanner support'
+'python-pillow: for commandline scanning support'
+#'python2-notify: for Desktop notification support'
+'python-reportlab: for pdf output in hp-scan'
+'rpcbind: for network support'
+'python-pyqt4: for running GUI and hp-toolbox'
+'python-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices (AUR) or run 
hp-setup to download the plugin'
+'libusb: for advanced usb support')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+disable_upgrade.patch)
+sha1sums=('efebad73f29ab9f77d5a866c1c5d3857cc5f1df5'
+  'SKIP'
+  '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
+
+prepare() {
+ cd $pkgname-$pkgver
+ 
+# export PYTHON=python2
+ 
+# find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+# sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
+# sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
+# sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+# sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+# sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
+# sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+# sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+# sed -i 's|/usr/bin/python|/usr/bin/python2|' 
data/rules/hplip-printer@.service
+ 
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build #--help
+ make
+}
+
+package() {
+ #cd $pkgname-$p

[arch-commits] Commit in hplip/repos (8 files)

2013-11-09 Thread Andreas Radke

Date: Saturday, November 9, 2013 @ 20:21:46
  Author: andyrtr
Revision: 199298

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 199297, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 199297, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 199297, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 199297, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 /PKGBUILD  |  184 +++
 /hplip.install |   36 
 extra-i686/PKGBUILD|   92 -
 extra-i686/hplip.install   |   18 
 extra-x86_64/PKGBUILD  |   92 -
 extra-x86_64/hplip.install |   18 
 6 files changed, 220 insertions(+), 220 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-11-09 19:21:00 UTC (rev 199297)
+++ extra-i686/PKGBUILD 2013-11-09 19:21:46 UTC (rev 199298)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.13.10
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1' 'wget')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
-optdepends=('cups: for printing support'
-'python2-dbus: for dbus support'
-'sane: for scanner support'
-'python2-pillow: for commandline scanning support'
-'python2-notify: for Desktop notification support'
-'python2-reportlab: for pdf output in hp-scan'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices'
-'libusbx: for advanced usb support')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('ba729c514a2dc95390b99e9a9d452999'
- 'SKIP')
-
-prepare() {
- cd $pkgname-$pkgver
- 
- export PYTHON=python2
- 
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
- 
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-   local i
-   for i in ppd/hpijs/*.ppd.gz ; do
-   rm -f ${i}.temp
-   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-   gzip > ${i}.temp || return 1
-   mv ${i}.temp ${i}
-   done
-   
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules #--help
-
- make
-}
-
-package() {
- #cd $pkgname-$pkgver
- cd $pkgname-${pkgver/.a/a}
- make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- 
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- 
- # remove HAL .fdi file because HAL is no longer used
- rm -vrf "$pkgdir"/usr/share/hal
- 
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 199297, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-09 19:21:46 UTC (rev 199298)
@@ -0,0 +1,92 @@
+# $Id$
+#

[arch-commits] Commit in hplip/repos (8 files)

2013-10-18 Thread Andreas Radke

Date: Friday, October 18, 2013 @ 15:51:24
  Author: andyrtr
Revision: 196770

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 196769, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 196769, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 196769, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 196769, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 /PKGBUILD  |  186 +++
 /hplip.install |   36 
 extra-i686/PKGBUILD|   92 -
 extra-i686/hplip.install   |   18 
 extra-x86_64/PKGBUILD  |   92 -
 extra-x86_64/hplip.install |   18 
 6 files changed, 222 insertions(+), 220 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-10-18 13:50:49 UTC (rev 196769)
+++ extra-i686/PKGBUILD 2013-10-18 13:51:24 UTC (rev 196770)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.13.10
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1' 'wget')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
-optdepends=('cups: for printing support'
-'python2-dbus: for dbus support'
-'sane: for scanner support'
-'python2-pillow: for commandline scanning support'
-'python2-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices'
-'libusbx: for advanced usb support')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('ba729c514a2dc95390b99e9a9d452999'
- 'SKIP')
-
-prepare() {
- cd $pkgname-$pkgver
- 
- export PYTHON=python2
- 
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
- 
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-   local i
-   for i in ppd/hpijs/*.ppd.gz ; do
-   rm -f ${i}.temp
-   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-   gzip > ${i}.temp || return 1
-   mv ${i}.temp ${i}
-   done
-   
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules #--help
-
- make
-}
-
-package() {
- #cd $pkgname-$pkgver
- cd $pkgname-${pkgver/.a/a}
- make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- 
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- 
- # remove HAL .fdi file because HAL is no longer used
- rm -vrf "$pkgdir"/usr/share/hal
- 
- # remove rc script
- rm -vrf "$pkgdir"/etc/init.d
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 196769, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-18 13:51:24 UTC (rev 196770)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributo

[arch-commits] Commit in hplip/repos (8 files)

2013-09-15 Thread Andreas Radke

Date: Sunday, September 15, 2013 @ 10:01:04
  Author: andyrtr
Revision: 194376

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  hplip/repos/staging-i686/
  hplip/repos/staging-i686/PKGBUILD
(from rev 194375, hplip/trunk/PKGBUILD)
  hplip/repos/staging-i686/hp-mkuri.patch
(from rev 194375, hplip/trunk/hp-mkuri.patch)
  hplip/repos/staging-i686/hplip.install
(from rev 194375, hplip/trunk/hplip.install)
  hplip/repos/staging-x86_64/
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 194375, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/hp-mkuri.patch
(from rev 194375, hplip/trunk/hp-mkuri.patch)
  hplip/repos/staging-x86_64/hplip.install
(from rev 194375, hplip/trunk/hplip.install)

---+
 staging-i686/PKGBUILD |   93 
 staging-i686/hp-mkuri.patch   |   11 
 staging-i686/hplip.install|   18 +++
 staging-x86_64/PKGBUILD   |   93 
 staging-x86_64/hp-mkuri.patch |   11 
 staging-x86_64/hplip.install  |   18 +++
 6 files changed, 244 insertions(+)

Copied: hplip/repos/staging-i686/PKGBUILD (from rev 194375, 
hplip/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-09-15 08:01:04 UTC (rev 194376)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.13.9
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
+optdepends=('cups: for printing support'
+'python2-dbus: for dbus support'
+'sane: for scanner support'
+'python2-pillow: for commandline scanning support'
+'python2-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices'
+'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+hp-mkuri.patch)
+md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
+ 'SKIP'
+ '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ export PYTHON=python2
+ 
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove

[arch-commits] Commit in hplip/repos (8 files)

2013-09-12 Thread Andreas Radke

Date: Thursday, September 12, 2013 @ 21:55:31
  Author: andyrtr
Revision: 194277

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 194276, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hp-mkuri.patch
(from rev 194276, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-i686/hplip.install
(from rev 194276, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 194276, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hp-mkuri.patch
(from rev 194276, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-x86_64/hplip.install
(from rev 194276, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   93 
 testing-i686/hp-mkuri.patch   |   11 
 testing-i686/hplip.install|   18 +++
 testing-x86_64/PKGBUILD   |   93 
 testing-x86_64/hp-mkuri.patch |   11 
 testing-x86_64/hplip.install  |   18 +++
 6 files changed, 244 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 194276, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-09-12 19:55:31 UTC (rev 194277)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.13.9
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
+optdepends=('cups: for printing support'
+'python2-dbus: for dbus support'
+'sane: for scanner support'
+'python2-imaging: for commandline scanning support'
+'python2-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices'
+'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+hp-mkuri.patch)
+md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
+ 'SKIP'
+ '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ export PYTHON=python2
+ 
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # rem

[arch-commits] Commit in hplip/repos (8 files)

2013-08-15 Thread Andreas Radke

Date: Thursday, August 15, 2013 @ 17:25:36
  Author: andyrtr
Revision: 193076

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 193075, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hp-mkuri.patch
(from rev 193075, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-i686/hplip.install
(from rev 193075, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 193075, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hp-mkuri.patch
(from rev 193075, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-x86_64/hplip.install
(from rev 193075, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   93 
 testing-i686/hp-mkuri.patch   |   11 
 testing-i686/hplip.install|   18 +++
 testing-x86_64/PKGBUILD   |   93 
 testing-x86_64/hp-mkuri.patch |   11 
 testing-x86_64/hplip.install  |   18 +++
 6 files changed, 244 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 193075, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-08-15 15:25:36 UTC (rev 193076)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.13.8
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
+optdepends=('cups: for printing support'
+'python2-dbus: for dbus support'
+'sane: for scanner support'
+'python2-imaging: for commandline scanning support'
+'python2-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices'
+'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+hp-mkuri.patch)
+md5sums=('44de6a1e4d295ae6f1f0f0ef1cdc7301'
+ 'SKIP'
+ '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ export PYTHON=python2
+ 
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove

[arch-commits] Commit in hplip/repos (8 files)

2013-07-25 Thread Andreas Radke

Date: Thursday, July 25, 2013 @ 22:33:27
  Author: andyrtr
Revision: 191570

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 191569, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hp-mkuri.patch
(from rev 191569, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-i686/hplip.install
(from rev 191569, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 191569, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hp-mkuri.patch
(from rev 191569, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-x86_64/hplip.install
(from rev 191569, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   93 
 testing-i686/hp-mkuri.patch   |   11 
 testing-i686/hplip.install|   18 +++
 testing-x86_64/PKGBUILD   |   93 
 testing-x86_64/hp-mkuri.patch |   11 
 testing-x86_64/hplip.install  |   18 +++
 6 files changed, 244 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 191569, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-07-25 20:33:27 UTC (rev 191570)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.13.7
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
+optdepends=('cups: for printing support'
+'python2-dbus: for dbus support'
+'sane: for scanner support'
+'python2-imaging: for commandline scanning support'
+'python2-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices'
+'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+hp-mkuri.patch)
+md5sums=('e834c8dd270f441c963f5d883d2d48f3'
+ 'SKIP'
+ '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ export PYTHON=python2
+ 
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove r

[arch-commits] Commit in hplip/repos (8 files)

2013-06-27 Thread Andreas Radke

Date: Thursday, June 27, 2013 @ 16:29:57
  Author: andyrtr
Revision: 188977

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 188976, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hp-mkuri.patch
(from rev 188976, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-i686/hplip.install
(from rev 188976, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 188976, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hp-mkuri.patch
(from rev 188976, hplip/trunk/hp-mkuri.patch)
  hplip/repos/testing-x86_64/hplip.install
(from rev 188976, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   93 
 testing-i686/hp-mkuri.patch   |   11 
 testing-i686/hplip.install|   18 +++
 testing-x86_64/PKGBUILD   |   93 
 testing-x86_64/hp-mkuri.patch |   11 
 testing-x86_64/hplip.install  |   18 +++
 6 files changed, 244 insertions(+)

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 188976, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-06-27 14:29:57 UTC (rev 188977)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.13.6
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1' 'wget')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
+optdepends=('cups: for printing support'
+'python2-dbus: for dbus support'
+'sane: for scanner support'
+'python2-imaging: for commandline scanning support'
+'python2-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices'
+'libusbx: for advanced usb support')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+hp-mkuri.patch)
+md5sums=('3dd5052864052b8cd4ce013bb71f4d6c'
+ 'SKIP'
+ '0bd7779fdbc4d7a9386df04dce2cb8d4')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
+ export PYTHON=python2
+ 
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py 
makeuri.py logcapture.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ 
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+   local i
+   for i in ppd/hpijs/*.ppd.gz ; do
+   rm -f ${i}.temp
+   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+   gzip > ${i}.temp || return 1
+   mv ${i}.temp ${i}
+   done
+   
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --disable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-new-hpcups \
+ --enable-cups-ppd-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules #--help
+
+ make
+}
+
+package() {
+ #cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ # remove HAL .fdi file because HAL is no longer used
+ rm -rf "$pkgdir"/usr/share/hal
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove r

[arch-commits] Commit in hplip/repos (8 files)

2013-02-16 Thread Tom Gundersen

Date: Sunday, February 17, 2013 @ 00:09:10
  Author: tomegun
Revision: 178146

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 178145, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/cups-1.6-buildfix.diff
(from rev 178145, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/testing-i686/hplip.install
(from rev 178145, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 178145, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/cups-1.6-buildfix.diff
(from rev 178145, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/testing-x86_64/hplip.install
(from rev 178145, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   93 +++
 testing-i686/cups-1.6-buildfix.diff   |  392 
 testing-i686/hplip.install|   18 +
 testing-x86_64/PKGBUILD   |   93 +++
 testing-x86_64/cups-1.6-buildfix.diff |  392 
 testing-x86_64/hplip.install  |   18 +
 6 files changed, 1006 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 178145:178146 to see the changes.

[arch-commits] Commit in hplip/repos (8 files)

2012-11-27 Thread Tom Gundersen

Date: Tuesday, November 27, 2012 @ 13:23:03
  Author: tomegun
Revision: 172082

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 172081, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/cups-1.6-buildfix.diff
(from rev 172081, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/testing-i686/hplip.install
(from rev 172081, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 172081, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/cups-1.6-buildfix.diff
(from rev 172081, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/testing-x86_64/hplip.install
(from rev 172081, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   92 +++
 testing-i686/cups-1.6-buildfix.diff   |  392 
 testing-i686/hplip.install|   18 +
 testing-x86_64/PKGBUILD   |   92 +++
 testing-x86_64/cups-1.6-buildfix.diff |  392 
 testing-x86_64/hplip.install  |   18 +
 6 files changed, 1004 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 172081:172082 to see the changes.

[arch-commits] Commit in hplip/repos (8 files)

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:12:35
  Author: eric
Revision: 168796

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  hplip/repos/staging-i686/
  hplip/repos/staging-i686/PKGBUILD
(from rev 168795, hplip/trunk/PKGBUILD)
  hplip/repos/staging-i686/cups-1.6-buildfix.diff
(from rev 168795, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/staging-i686/hplip.install
(from rev 168795, hplip/trunk/hplip.install)
  hplip/repos/staging-x86_64/
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 168795, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/cups-1.6-buildfix.diff
(from rev 168795, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/staging-x86_64/hplip.install
(from rev 168795, hplip/trunk/hplip.install)

---+
 staging-i686/PKGBUILD |   97 +++
 staging-i686/cups-1.6-buildfix.diff   |  392 
 staging-i686/hplip.install|   18 +
 staging-x86_64/PKGBUILD   |   97 +++
 staging-x86_64/cups-1.6-buildfix.diff |  392 
 staging-x86_64/hplip.install  |   18 +
 6 files changed, 1014 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 168795:168796 to see the changes.

[arch-commits] Commit in hplip/repos (8 files)

2012-10-06 Thread andyrtr

Date: Saturday, October 6, 2012 @ 17:22:11
  Author: andyrtr
Revision: 168250

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/
  hplip/repos/testing-i686/PKGBUILD
(from rev 168249, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/cups-1.6-buildfix.diff
(from rev 168249, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/testing-i686/hplip.install
(from rev 168249, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 168249, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/cups-1.6-buildfix.diff
(from rev 168249, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/testing-x86_64/hplip.install
(from rev 168249, hplip/trunk/hplip.install)

---+
 testing-i686/PKGBUILD |   92 +++
 testing-i686/cups-1.6-buildfix.diff   |  392 
 testing-i686/hplip.install|   18 +
 testing-x86_64/PKGBUILD   |   92 +++
 testing-x86_64/cups-1.6-buildfix.diff |  392 
 testing-x86_64/hplip.install  |   18 +
 6 files changed, 1004 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 168249:168250 to see the changes.

[arch-commits] Commit in hplip/repos (8 files)

2012-06-25 Thread andyrtr

Date: Monday, June 25, 2012 @ 11:19:00
  Author: andyrtr
Revision: 162334

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 162333, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 162333, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 162333, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 162333, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 extra-i686/PKGBUILD|  171 +--
 extra-i686/hplip.install   |   36 -
 extra-x86_64/PKGBUILD  |  171 +--
 extra-x86_64/hplip.install |   36 -
 4 files changed, 208 insertions(+), 206 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-06-25 15:18:23 UTC (rev 162333)
+++ extra-i686/PKGBUILD 2012-06-25 15:19:00 UTC (rev 162334)
@@ -1,85 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.12.6
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 
'libusbx')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices'
-'libusbx: for advanced usb support')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('5303938e8630775ea6fb383af85775e5'
- 'b562457e4c713d8609b3d6dd2be10baf')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- 
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py 
uninstall.py upgrade.py config_usb_printer.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-   local i
-   for i in ppd/hpijs/*.ppd.gz ; do
-   rm -f ${i}.temp
-   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-   gzip > ${i}.temp || return 1
-   mv ${i}.temp ${i}
-   done
-   
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules #--help
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 162333, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-06-25 15:19:00 UTC (rev 162334)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.12.6
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, Office

[arch-commits] Commit in hplip/repos (8 files)

2012-06-02 Thread andyrtr

Date: Saturday, June 2, 2012 @ 17:07:20
  Author: andyrtr
Revision: 160609

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/PKGBUILD
(from rev 160608, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hplip.install
(from rev 160608, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 160608, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hplip.install
(from rev 160608, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/testing-i686/PKGBUILD
  hplip/repos/testing-i686/hplip.install
  hplip/repos/testing-x86_64/PKGBUILD
  hplip/repos/testing-x86_64/hplip.install

--+
 testing-i686/PKGBUILD|  166 -
 testing-i686/hplip.install   |   28 --
 testing-x86_64/PKGBUILD  |  166 -
 testing-x86_64/hplip.install |   28 --
 4 files changed, 204 insertions(+), 184 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-06-02 21:06:41 UTC (rev 160608)
+++ testing-i686/PKGBUILD   2012-06-02 21:07:20 UTC (rev 160609)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.12.4
-pkgrel=3
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
- '2fe18f4091afb3dec200271dc7836128')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-   local i
-   for i in ppd/hpijs/*.ppd.gz ; do
-   rm -f ${i}.temp
-   gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-   gzip > ${i}.temp || return 1
-   mv ${i}.temp ${i}
-   done
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 160608, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-06-02 21:07:20 UTC (rev 160609)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.12.4
+pkgrel=4
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+dep

[arch-commits] Commit in hplip/repos (8 files)

2012-05-31 Thread andyrtr

Date: Thursday, May 31, 2012 @ 15:55:56
  Author: andyrtr
Revision: 160265

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/PKGBUILD
(from rev 160264, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hplip.install
(from rev 160264, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 160264, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hplip.install
(from rev 160264, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/testing-i686/PKGBUILD
  hplip/repos/testing-i686/hplip.install
  hplip/repos/testing-x86_64/PKGBUILD
  hplip/repos/testing-x86_64/hplip.install

--+
 testing-i686/PKGBUILD|  153 +
 testing-i686/hplip.install   |   20 ++---
 testing-x86_64/PKGBUILD  |  153 +
 testing-x86_64/hplip.install |   20 ++---
 4 files changed, 184 insertions(+), 162 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-05-31 19:55:14 UTC (rev 160264)
+++ testing-i686/PKGBUILD   2012-05-31 19:55:56 UTC (rev 160265)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.12.4
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
- '2fe18f4091afb3dec200271dc7836128')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --disable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 160264, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-05-31 19:55:56 UTC (rev 160265)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.12.4
+pkgrel=3
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for netw

[arch-commits] Commit in hplip/repos (8 files)

2012-04-22 Thread Tom Gundersen

Date: Sunday, April 22, 2012 @ 19:37:25
  Author: tomegun
Revision: 156683

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 156682, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 156682, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 156682, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 156682, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 extra-i686/PKGBUILD|  142 +--
 extra-i686/hplip.install   |   20 +++---
 extra-x86_64/PKGBUILD  |  142 +--
 extra-x86_64/hplip.install |   20 +++---
 4 files changed, 162 insertions(+), 162 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-04-22 23:37:00 UTC (rev 156682)
+++ extra-i686/PKGBUILD 2012-04-22 23:37:25 UTC (rev 156683)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.12.2
-pkgrel=3
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-sha1sums=('bdf3e37a344f5b57b62425f755c4293d6d4ae875'
-  'aa00cdf755fea38f39247a0a4a2e8241dc15112c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 156682, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-22 23:37:25 UTC (rev 156683)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.12.4
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for

[arch-commits] Commit in hplip/repos (8 files)

2012-04-08 Thread Tom Gundersen

Date: Sunday, April 8, 2012 @ 19:43:32
  Author: tomegun
Revision: 155903

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 155902, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 155902, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 155902, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 155902, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 extra-i686/PKGBUILD|  139 +--
 extra-i686/hplip.install   |   20 +++---
 extra-x86_64/PKGBUILD  |  139 +--
 extra-x86_64/hplip.install |   20 +++---
 4 files changed, 162 insertions(+), 156 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-04-08 23:43:03 UTC (rev 155902)
+++ extra-i686/PKGBUILD 2012-04-08 23:43:32 UTC (rev 155903)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.12.2
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-pyqt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-sha1sums=('bdf3e37a344f5b57b62425f755c4293d6d4ae875'
-  'aa00cdf755fea38f39247a0a4a2e8241dc15112c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 155902, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-08 23:43:32 UTC (rev 155903)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.12.2
+pkgrel=3
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+

[arch-commits] Commit in hplip/repos (8 files)

2012-04-08 Thread Tom Gundersen

Date: Sunday, April 8, 2012 @ 18:59:32
  Author: tomegun
Revision: 155897

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 155896, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 155896, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 155896, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 155896, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 extra-i686/PKGBUILD|  135 +--
 extra-i686/hplip.install   |   20 +++---
 extra-x86_64/PKGBUILD  |  135 +--
 extra-x86_64/hplip.install |   20 +++---
 4 files changed, 156 insertions(+), 154 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-04-08 22:59:06 UTC (rev 155896)
+++ extra-i686/PKGBUILD 2012-04-08 22:59:32 UTC (rev 155897)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.12.2
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-qt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-sha1sums=('bdf3e37a344f5b57b62425f755c4293d6d4ae875'
-  'aa00cdf755fea38f39247a0a4a2e8241dc15112c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py 
ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 155896, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-08 22:59:32 UTC (rev 155897)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.12.2
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-pyqt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs

[arch-commits] Commit in hplip/repos (8 files)

2011-12-04 Thread Eric Bélanger

Date: Sunday, December 4, 2011 @ 22:45:19
  Author: eric
Revision: 144358

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hplip/repos/extra-i686/PKGBUILD
(from rev 144357, hplip/trunk/PKGBUILD)
  hplip/repos/extra-i686/hplip.install
(from rev 144357, hplip/trunk/hplip.install)
  hplip/repos/extra-x86_64/PKGBUILD
(from rev 144357, hplip/trunk/PKGBUILD)
  hplip/repos/extra-x86_64/hplip.install
(from rev 144357, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/extra-i686/PKGBUILD
  hplip/repos/extra-i686/hplip.install
  hplip/repos/extra-x86_64/PKGBUILD
  hplip/repos/extra-x86_64/hplip.install

+
 extra-i686/PKGBUILD|  128 ++-
 extra-i686/hplip.install   |   20 +++---
 extra-x86_64/PKGBUILD  |  128 ++-
 extra-x86_64/hplip.install |   20 +++---
 4 files changed, 156 insertions(+), 140 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-05 03:44:51 UTC (rev 144357)
+++ extra-i686/PKGBUILD 2011-12-05 03:45:19 UTC (rev 144358)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.11.10
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-qt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('6143f30f3b6905ef22105176a3b80db0'
- '396bbd8c5cc92aa8295e5bcb508692f3')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
--e "s|sysfs|attr|g" \
-   data/rules/56-hpmud_support.rules
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d  DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
-}

Copied: hplip/repos/extra-i686/PKGBUILD (from rev 144357, hplip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-05 03:45:19 UTC (rev 144358)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.11.10
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-qt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+ '396bbd8c5cc92aa8295e5bcb508692f3')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ export PYTHON=python2
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i '

[arch-commits] Commit in hplip/repos (8 files)

2011-10-13 Thread Eric Bélanger

Date: Friday, October 14, 2011 @ 01:01:01
  Author: eric
Revision: 140428

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  hplip/repos/testing-i686/PKGBUILD
(from rev 140427, hplip/trunk/PKGBUILD)
  hplip/repos/testing-i686/hplip.install
(from rev 140427, hplip/trunk/hplip.install)
  hplip/repos/testing-x86_64/PKGBUILD
(from rev 140427, hplip/trunk/PKGBUILD)
  hplip/repos/testing-x86_64/hplip.install
(from rev 140427, hplip/trunk/hplip.install)
Deleted:
  hplip/repos/testing-i686/PKGBUILD
  hplip/repos/testing-i686/hplip.install
  hplip/repos/testing-x86_64/PKGBUILD
  hplip/repos/testing-x86_64/hplip.install

--+
 testing-i686/PKGBUILD|  120 -
 testing-i686/hplip.install   |   20 +++---
 testing-x86_64/PKGBUILD  |  120 -
 testing-x86_64/hplip.install |   20 +++---
 4 files changed, 140 insertions(+), 140 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2011-10-14 04:53:07 UTC (rev 140427)
+++ testing-i686/PKGBUILD   2011-10-14 05:01:01 UTC (rev 140428)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer : Rémy Oudompheng 
-# Contributor: Morgan LEFIEUX 
-
-pkgname=hplip
-pkgver=3.11.10
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com";
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-'net-snmp>=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-'dbus-python: for dbus support'
-'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
-'rpcbind: for network support'
-'python2-qt: for running hp-toolbox'
-'python2-gobject2: for running hp-toolbox'
-'hplip-plugin: binary blobs for specific devices')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('6143f30f3b6905ef22105176a3b80db0'
- '396bbd8c5cc92aa8295e5bcb508692f3')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
--e "s|sysfs|attr|g" \
-   data/rules/56-hpmud_support.rules
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d  DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
-}

Copied: hplip/repos/testing-i686/PKGBUILD (from rev 140427, 
hplip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-14 05:01:01 UTC (rev 140428)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.11.10
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+'net-snmp>=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-qt: for running hp-toolbox'
+'python2-gobject2: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+ '396bbd8c5cc92aa8295e5bcb508692f3')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ export PYTHON=python2
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|

[arch-commits] Commit in hplip/repos (8 files)

2011-09-29 Thread Eric Bélanger

Date: Thursday, September 29, 2011 @ 03:21:38
  Author: eric
Revision: 139100

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  hplip/repos/staging-i686/
  hplip/repos/staging-i686/PKGBUILD
(from rev 139099, hplip/trunk/PKGBUILD)
  hplip/repos/staging-i686/hplip-cups-1.5.0-compatibility.patch
(from rev 139099, hplip/trunk/hplip-cups-1.5.0-compatibility.patch)
  hplip/repos/staging-i686/hplip.install
(from rev 139099, hplip/trunk/hplip.install)
  hplip/repos/staging-x86_64/
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 139099, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/hplip-cups-1.5.0-compatibility.patch
(from rev 139099, hplip/trunk/hplip-cups-1.5.0-compatibility.patch)
  hplip/repos/staging-x86_64/hplip.install
(from rev 139099, hplip/trunk/hplip.install)

-+
 staging-i686/PKGBUILD   |   71 ++
 staging-i686/hplip-cups-1.5.0-compatibility.patch   |   10 ++
 staging-i686/hplip.install  |   10 ++
 staging-x86_64/PKGBUILD |   71 ++
 staging-x86_64/hplip-cups-1.5.0-compatibility.patch |   10 ++
 staging-x86_64/hplip.install|   10 ++
 6 files changed, 182 insertions(+)

Copied: hplip/repos/staging-i686/PKGBUILD (from rev 139099, 
hplip/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2011-09-29 07:21:38 UTC (rev 139100)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer : Rémy Oudompheng 
+# Contributor: Morgan LEFIEUX 
+
+pkgname=hplip
+pkgver=3.11.7
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com";
+license=('GPL')
+makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 
'cups')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+   'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat')
+optdepends=('cups: for printing support'
+'dbus-python: for dbus support'
+'sane: for scanner support'
+'python-imaging: for commandline scanning support'
+'python-notify: for Desktop notification support'
+'rpcbind: for network support'
+'python2-qt: for running hp-toolbox'
+'pygobject: for running hp-toolbox'
+'hplip-plugin: binary blobs for specific devices')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+hplip-cups-1.5.0-compatibility.patch)
+md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1'
+ 'f4422ee0dc842e1a53b75c24f468d65c'
+ 'a767000ce920e9f7f6a5b0a8e4392ef9')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch"
+ export PYTHON=python2
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ ./configure --prefix=/usr \
+ --enable-qt4 \
+ --enable-foomatic-rip-hplip-install \
+ --enable-foomatic-ppd-install \
+ --enable-hpcups-install \
+ --enable-cups-drv-install \
+ --enable-hpijs-install \
+ --enable-foomatic-drv-install \
+ --enable-pp-build \
+ --enable-udev-acl-rules
+
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+
+ rm -rf "$pkgdir/etc/sane.d"
+ # remove autostart of hp-daemon
+ rm -r "$pkgdir/etc/xdg"
+ # move udev rules to /lib/udev/rules.d
+ mkdir -p "$pkgdir/lib/udev/rules.d"
+ mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
+ rm -r "$pkgdir/etc/udev"
+ # remove lp user, it's not used on archlinux
+ sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules"
+ # fix sysfs rules
+ sed -i -e "s|SYSFS|ATTR|g" \
+-e "s|sysfs|attr|g" \
+-e 's|"bin/sh|"/bin/sh|g' \
+   "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules"
+}
+

Copied: hplip/repos/staging-i686/hplip-cups-1.5.0-compatibility.patch (from rev 
139099, hplip/trunk/hplip-cups-1.5.0-compatibility.patch)
===
--- staging-i686/hplip-cups-1.5.0-compatibility.patch   
(rev 0)
+++ staging-i686/hplip-cups-1.5.0-compatibility.patch   2011-09-29 07:21:38 UTC 
(rev 139100)
@@ -0,0 +1,10 @@
+--- hplip-3.11.7~/prnt/hpps/hppsfilter.c   2011-07-24 18:58:05.0 
+
 hplip-3.11.7/prnt/hpps/hppsfilter.c2011-08-09 20:51:54.150214165 
+
+@@ -38,6 +38,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 

Copied: hplip/repos/staging-i686/hplip.install (from rev 139099, 
hplip/trunk/hplip.install)
=

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

[arch-commits] Commit in hplip/repos (8 files)

33 matches

Site Navigation

Mail list logo

Footer information