Patchwork [1/1] hplip: bump to version 3.13.10

login
register
mail settings
Submitter Olivier Schonken
Date Oct. 30, 2013, 8:37 p.m.
Message ID <1383165435-14305-1-git-send-email-olivier.schonken@gmail.com>
Download mbox | patch
Permalink /patch/287346/
State Accepted
Commit 2b0d870ce57dc92373788fb8cf7dd1add621c6eb
Headers show

Comments

Olivier Schonken - Oct. 30, 2013, 8:37 p.m.
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 package/hplip/hplip-fix-make.patch | 39 --------------------------------------
 package/hplip/hplip.mk             |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
Thomas Petazzoni - Oct. 30, 2013, 9:16 p.m.
Dear Olivier Schonken,

On Wed, 30 Oct 2013 22:37:15 +0200, Olivier Schonken wrote:

>   # ui (qt3)
> -@@ -564,26 +564,26 @@ endif
> - 
> - install-dist_hplip_LogDATA:
> - if FULL_BUILD
> --	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
> --	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
> --	chmod 775 $(DESTDIR)$(hplip_Logdir)
> -+#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
> -+#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
> -+#	chmod 775 $(DESTDIR)$(hplip_Logdir)
> - endif	#FULL_BUILD
> - if HPLIP_BUILD
> --	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
> --	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
> --	chmod 775 $(DESTDIR)$(hplip_Logdir)
> -+#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
> -+#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
> -+#	chmod 775 $(DESTDIR)$(hplip_Logdir)
> - endif	#FULL_BUILD
> - 
> - install-dist_hplip_tmpDATA:
> - if FULL_BUILD
> --	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
> --	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
> --	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
> -+#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
> -+#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
> -+#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
> - endif	#FULL_BUILD
> - if HPLIP_BUILD
> --	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
> --	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
> --	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
> -+#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
> -+#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
> -+#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
> - endif	#FULL_BUILD
> - 
> - install-dist_cronDATA:$(dist_cron_DATA)

Thanks for this patch. Would you mind giving a few more details on the
reason for removing those lines? They are no longer present in the
upstream Makefile? Something else?

Generally speaking, when a version bump comes with other changes (like
changes to patches), it's good to describe them a little bit.

Thanks a lot!

Thomas

Patch

diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
index b26277d..da05d03 100644
--- a/package/hplip/hplip-fix-make.patch
+++ b/package/hplip/hplip-fix-make.patch
@@ -30,45 +30,6 @@  index 16ea902..b22f46a 100644
  endif
  
  # ui (qt3)
-@@ -564,26 +564,26 @@ endif
- 
- install-dist_hplip_LogDATA:
- if FULL_BUILD
--	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 775 $(DESTDIR)$(hplip_Logdir)
-+#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#	chmod 775 $(DESTDIR)$(hplip_Logdir)
- endif	#FULL_BUILD
- if HPLIP_BUILD
--	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 775 $(DESTDIR)$(hplip_Logdir)
-+#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#	chmod 775 $(DESTDIR)$(hplip_Logdir)
- endif	#FULL_BUILD
- 
- install-dist_hplip_tmpDATA:
- if FULL_BUILD
--	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
--	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
-+#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-+#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- if HPLIP_BUILD
--	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
--	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
-+#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-+#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- 
- install-dist_cronDATA:$(dist_cron_DATA)
 -- 
 1.7.10.4
 
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index b3b798d..704bc4b 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-HPLIP_VERSION = 3.13.3
+HPLIP_VERSION = 3.13.10
 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
 HPLIP_AUTORECONF = YES
 HPLIP_DEPENDENCIES = cups libusb jpeg