Patchwork [3/4] usb_modeswitch: bump to 1.2.6

login
register
mail settings
Submitter Richard Genoud
Date June 20, 2013, 3:53 p.m.
Message ID <1371743610-17810-4-git-send-email-richard.genoud@gmail.com>
Download mbox | patch
Permalink /patch/253019/
State Superseded
Headers show

Comments

Richard Genoud - June 20, 2013, 3:53 p.m.
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 .../usb_modeswitch/usb_modeswitch-makefile.patch   |   31 --------------------
 package/usb_modeswitch/usb_modeswitch.mk           |    2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 package/usb_modeswitch/usb_modeswitch-makefile.patch
Thomas Petazzoni - June 20, 2013, 4 p.m.
Dear Richard Genoud,

On Thu, 20 Jun 2013 17:53:29 +0200, Richard Genoud wrote:
> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
> ---
>  .../usb_modeswitch/usb_modeswitch-makefile.patch   |   31 --------------------
>  package/usb_modeswitch/usb_modeswitch.mk           |    2 +-
>  2 files changed, 1 insertion(+), 32 deletions(-)
>  delete mode 100644 package/usb_modeswitch/usb_modeswitch-makefile.patch

When bumping to a new version leads to the removal of some patches, it
is always good to mention /why/ they are removed (they got upstreamed,
they are no longer needed because..).

Thanks!

Thomas
Richard Genoud - June 20, 2013, 5:02 p.m.
2013/6/20 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Dear Richard Genoud,
>
> On Thu, 20 Jun 2013 17:53:29 +0200, Richard Genoud wrote:
>> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
>> ---
>>  .../usb_modeswitch/usb_modeswitch-makefile.patch   |   31 --------------------
>>  package/usb_modeswitch/usb_modeswitch.mk           |    2 +-
>>  2 files changed, 1 insertion(+), 32 deletions(-)
>>  delete mode 100644 package/usb_modeswitch/usb_modeswitch-makefile.patch
>
> When bumping to a new version leads to the removal of some patches, it
> is always good to mention /why/ they are removed (they got upstreamed,
> they are no longer needed because..).

You're right, I've been a little lazy on this !
I'll resend the whole set tomorrow.

Thanks,

Richard.
Gustavo Zacarias - June 20, 2013, 5:04 p.m.
On 06/20/2013 02:02 PM, Richard Genoud wrote:

> 2013/6/20 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
>> Dear Richard Genoud,
>>
>> On Thu, 20 Jun 2013 17:53:29 +0200, Richard Genoud wrote:
>>> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
>>> ---
>>>  .../usb_modeswitch/usb_modeswitch-makefile.patch   |   31 --------------------
>>>  package/usb_modeswitch/usb_modeswitch.mk           |    2 +-
>>>  2 files changed, 1 insertion(+), 32 deletions(-)
>>>  delete mode 100644 package/usb_modeswitch/usb_modeswitch-makefile.patch
>>
>> When bumping to a new version leads to the removal of some patches, it
>> is always good to mention /why/ they are removed (they got upstreamed,
>> they are no longer needed because..).
> 
> You're right, I've been a little lazy on this !
> I'll resend the whole set tomorrow.

Never mind about 3-4/4 since it's been already done by Patrick Ziegler
and committed already :)
Regards.

Patch

diff --git a/package/usb_modeswitch/usb_modeswitch-makefile.patch b/package/usb_modeswitch/usb_modeswitch-makefile.patch
deleted file mode 100644
index b792741..0000000
--- a/package/usb_modeswitch/usb_modeswitch-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-Removed the -s from the install command. Without this, usb_modeswitch would
-fail to install.
-
-Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -46,7 +46,7 @@
- 	cd jim && $(MAKE) distclean
- 
- install-common: all
--	install -D -s --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
-+	install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
- 	install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
- 	install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
- 	install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
-@@ -67,10 +67,10 @@
- install: install-common install-script
- 
- install-shared: dispatcher-dynamic install-common
--	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
-+	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- 
- install-static: dispatcher-static install-common
--	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
-+	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- 
- uninstall:
- 	$(RM) $(SBINDIR)/usb_modeswitch
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 653109d..35f90bb 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -4,7 +4,7 @@ 
 #
 #############################################################
 
-USB_MODESWITCH_VERSION = 1.2.5
+USB_MODESWITCH_VERSION = 1.2.6
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb-compat