diff -Nru sl-modem-2.9.11~20110321/debian/changelog sl-modem-2.9.11~20110321/debian/changelog --- sl-modem-2.9.11~20110321/debian/changelog 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/changelog 2014-10-24 09:33:43.000000000 +0000 @@ -1,3 +1,17 @@ +sl-modem (2.9.11~20110321-11) unstable; urgency=medium + + * debian/sl-modem-daemon.init: Source /lib/lsb/init-functions in init + script. + * Added fix_perms.diff to fix module build failure against linux kernel 3.16 + (LP: #1362764) + * debian/control: Bump Standards-Version to 3.9.6 + * Updated email address. + * debian/copyright: Moved copyright paragraph for debian/* below the + paragraph for *, to overcome a lintian issue. + * Remove unused lintian override. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Fri, 24 Oct 2014 10:31:01 +0200 + sl-modem (2.9.11~20110321-10) unstable; urgency=medium * Add Turkish translation. diff -Nru sl-modem-2.9.11~20110321/debian/control sl-modem-2.9.11~20110321/debian/control --- sl-modem-2.9.11~20110321/debian/control 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/control 2014-10-24 09:33:43.000000000 +0000 @@ -1,10 +1,10 @@ Source: sl-modem Section: non-free/misc Priority: optional -Maintainer: أحمد المحمودي (Ahmed El-Mahmoudy) +Maintainer: أحمد المحمودي (Ahmed El-Mahmoudy) Uploaders: Maurizio Avogadro , Rolf Leggewie Build-Depends: debhelper (>= 9), bzip2, libasound2-dev (>> 1.0.6), po-debconf, execstack, dkms (>= 2.1.1.2-1~) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://linmodems.technion.ac.il/packages/smartlink/ Vcs-Git: git://anonscm.debian.org/collab-maint/sl-modem.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/sl-modem.git diff -Nru sl-modem-2.9.11~20110321/debian/copyright sl-modem-2.9.11~20110321/debian/copyright --- sl-modem-2.9.11~20110321/debian/copyright 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/copyright 2014-10-24 09:33:43.000000000 +0000 @@ -9,16 +9,16 @@ and there should not be any legal issues with autobuilding the package. cf. http://lists.debian.org/debian-devel-announce/2006/11/msg00012.html +Files: * +Copyright: 2002, Smart Link Ltd. +License: BSD-3-clause + Files: debian/* Copyright: 2003-2008 Eduard Bloch - 2008-2014 أحمد المحمودي (Ahmed El-Mahmoudy) + 2008-2014 أحمد المحمودي (Ahmed El-Mahmoudy) 2010 Rolf Leggewie License: BSD-3-clause -Files: * -Copyright: 2002, Smart Link Ltd. -License: BSD-3-clause - License: BSD-3-clause Copyright (c) 2002, Smart Link Ltd. All rights reserved. diff -Nru sl-modem-2.9.11~20110321/debian/patches/arch64.diff sl-modem-2.9.11~20110321/debian/patches/arch64.diff --- sl-modem-2.9.11~20110321/debian/patches/arch64.diff 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/arch64.diff 2014-10-24 09:33:43.000000000 +0000 @@ -1,5 +1,5 @@ Description: Better arch detection logic -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) Bug-Debian: http://bugs.debian.org/651780 Forwarded: yes --- a/drivers/Makefile diff -Nru sl-modem-2.9.11~20110321/debian/patches/clean_LFLAGS.diff sl-modem-2.9.11~20110321/debian/patches/clean_LFLAGS.diff --- sl-modem-2.9.11~20110321/debian/patches/clean_LFLAGS.diff 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/clean_LFLAGS.diff 2014-10-24 09:33:43.000000000 +0000 @@ -1,6 +1,6 @@ Description: Just set LFLAGS to -lasound, also rename it to LDFLAGS Forwarded: yes -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) --- a/modem/Makefile +++ b/modem/Makefile @@ -41,19 +41,14 @@ diff -Nru sl-modem-2.9.11~20110321/debian/patches/device_create_changes.diff sl-modem-2.9.11~20110321/debian/patches/device_create_changes.diff --- sl-modem-2.9.11~20110321/debian/patches/device_create_changes.diff 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/device_create_changes.diff 2014-10-24 09:33:43.000000000 +0000 @@ -1,7 +1,7 @@ Description: Fix device_create call for linux kernel >= 2.6.27 * Also fixed device_create call for linux kernel >= 2.6.25 (two arguments were switched together !!!) * Used proper indentation to make things clear -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) Bug-Debian: http://bugs.debian.org/651781 Forwarded: yes --- a/drivers/st7554.c diff -Nru sl-modem-2.9.11~20110321/debian/patches/fix_perms.diff sl-modem-2.9.11~20110321/debian/patches/fix_perms.diff --- sl-modem-2.9.11~20110321/debian/patches/fix_perms.diff 1970-01-01 00:00:00.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/fix_perms.diff 2014-10-24 09:33:43.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fix permissions in module_param call +Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1362764 +--- a/drivers/amrmo_init.c ++++ b/drivers/amrmo_init.c +@@ -735,7 +735,7 @@ + * module stuff + */ + +-module_param(debug, int, 1); ++module_param(debug, int, S_IXUSR | S_IXGRP | S_IXOTH); + MODULE_PARM_DESC(debug,"debug level: 0-3 (default=0)"); + + MODULE_AUTHOR("Smart Link Ltd."); +--- a/drivers/st7554.c ++++ b/drivers/st7554.c +@@ -76,7 +76,7 @@ + + static int debug = 0; + +-module_param(debug, int, 1); ++module_param(debug, int, S_IXUSR | S_IXGRP | S_IXOTH); + MODULE_PARM_DESC(debug,"Debug level: 0-3 (default=0)"); + + /* st7554 IDs */ diff -Nru sl-modem-2.9.11~20110321/debian/patches/series sl-modem-2.9.11~20110321/debian/patches/series --- sl-modem-2.9.11~20110321/debian/patches/series 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/series 2014-10-24 09:33:43.000000000 +0000 @@ -13,3 +13,4 @@ arch64.diff use_CPPFLAGS.diff remove__devinitdata.diff +fix_perms.diff diff -Nru sl-modem-2.9.11~20110321/debian/patches/support_linux3.diff sl-modem-2.9.11~20110321/debian/patches/support_linux3.diff --- sl-modem-2.9.11~20110321/debian/patches/support_linux3.diff 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/support_linux3.diff 2014-10-24 09:33:43.000000000 +0000 @@ -1,5 +1,5 @@ Description: Support for linux 3.x series in build system -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) Bug-Debian: http://bugs.debian.org/641151 --- a/drivers/Makefile +++ b/drivers/Makefile diff -Nru sl-modem-2.9.11~20110321/debian/patches/support_multiarch.diff sl-modem-2.9.11~20110321/debian/patches/support_multiarch.diff --- sl-modem-2.9.11~20110321/debian/patches/support_multiarch.diff 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/support_multiarch.diff 2014-10-24 09:33:43.000000000 +0000 @@ -1,6 +1,6 @@ Description: Support multiarch include dirs libc6 moved arch dependent headers to multiarch include directory -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) --- a/modem/Makefile +++ b/modem/Makefile @@ -24,7 +24,7 @@ diff -Nru sl-modem-2.9.11~20110321/debian/patches/use_CPPFLAGS.diff sl-modem-2.9.11~20110321/debian/patches/use_CPPFLAGS.diff --- sl-modem-2.9.11~20110321/debian/patches/use_CPPFLAGS.diff 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/patches/use_CPPFLAGS.diff 2014-10-24 09:33:43.000000000 +0000 @@ -1,5 +1,5 @@ Description: Use CPPFLAGS for building slmodemd -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) --- a/modem/Makefile +++ b/modem/Makefile @@ -62,7 +62,7 @@ diff -Nru sl-modem-2.9.11~20110321/debian/sl-modem-daemon.init sl-modem-2.9.11~20110321/debian/sl-modem-daemon.init --- sl-modem-2.9.11~20110321/debian/sl-modem-daemon.init 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/sl-modem-daemon.init 2014-10-24 09:33:43.000000000 +0000 @@ -19,6 +19,8 @@ DESC="SmartLink modem daemon" modprobe="$(cat /proc/sys/kernel/modprobe 2>/dev/null || echo modprobe)" +. /lib/lsb/init-functions + test -x $DAEMON || exit 0 # there may be old options there... diff -Nru sl-modem-2.9.11~20110321/debian/sl-modem-dkms.lintian-overrides sl-modem-2.9.11~20110321/debian/sl-modem-dkms.lintian-overrides --- sl-modem-2.9.11~20110321/debian/sl-modem-dkms.lintian-overrides 2014-08-09 06:13:21.000000000 +0000 +++ sl-modem-2.9.11~20110321/debian/sl-modem-dkms.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# This file is actually a patch for a C code, not a license file. -sl-modem-dkms: extra-license-file usr/src/sl-modem-2.9.11~20110321/patches/sldiffs-20090222/05_st7554_license.diff