Added support for kernel 3.8 again

diff --git a/debian/changelog b/debian/changelog
index 2d7d7d0cc29a0eb300bc028c9ef9ed82b6df3d71..768af3aeac5859a8208616cca4dd178b955de557 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sasc-ng (620-15) unstable; urgency=low
+
+  * Added kernel 3.8 again
+
+ -- Jan-Pascal van Best <janpascal@vanbest.org>  Tue, 20 Aug 2013 23:59:50 +0200
+
 sasc-ng (620-14) unstable; urgency=low
 
   * Allow simultaneous installation for multiple kernel versions

diff --git a/debian/control.flavor b/debian/control.flavor
index f56157de763a739f4749e07dab658cb17f082201..df8007d862dc8daceb140f9b3470e95a24c2d3f1 100644 (file)
--- a/debian/control.flavor
+++ b/debian/control.flavor
@@ -3,7 +3,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sasc-ng-common (=${source:Version}),
  sasc-ng-kernel-#KERNEL# (=${source:Version})
-Provides: sasc-ng-daemon
+#Provides: sasc-ng-daemon
 Description: softcam to help decode DVB streams
  sasc-ng is a versatile SoftCAM which creates virtual DVB devices 
  and outputs through them.

diff --git a/debian/control.source b/debian/control.source
index 4df5cfbf25c1e29c6de086ec398c9d3e939bf25f..fc1dc0f7fcea4b6e6700f3c6a7d06433e4a2a25b 100644 (file)
--- a/debian/control.source
+++ b/debian/control.source
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8), libssl-dev (>= 1.0), gcc-4.6, g++-4.6,
 
 Package: sasc-ng-common
 Architecture: all
-Depends: ${misc:Depends}, sasc-ng-daemon
+Depends: ${misc:Depends}
 Description: softcam to help decode DVB streams
  sasc-ng is a versatile SoftCAM which creates virtual DVB devices 
  and outputs through them.

diff --git a/debian/rules b/debian/rules
index 5eea10048797d0bf6ec5c3b7fc6618e2b79ab3c1..8742dac041a689392ae293145580d484e9aa7ac3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -75,12 +75,17 @@ build_kernel_%:
        FIRST_KERNEL_DIGIT=$$(echo $${SHORT_KERNEL} | grep -o '^[[:digit:]]\+'); \
        SECOND_KERNEL_DIGIT=$$(echo $${SHORT_KERNEL} | grep -o '[[:digit:]]\+$$'); \
        XZ_KERNEL=$$(($${FIRST_KERNEL_DIGIT}>=3 && $${SECOND_KERNEL_DIGIT}>=10)); \
+       REPLACED_DVB_KERNEL=$$(($${FIRST_KERNEL_DIGIT}>=3 && $${SECOND_KERNEL_DIGIT}>=8)); \
         if [ $${XZ_KERNEL} -eq 1 ]; then \
-       KERNEL_TARBALL=/usr/src/linux-source-$${SHORT_KERNEL}.tar.xz; \
-       tar xJf $${KERNEL_TARBALL} -C $${tmpdir} --strip-components 4 linux-source-$${SHORT_KERNEL}/drivers/media/dvb-core/; \
+            KERNEL_TARBALL=/usr/src/linux-source-$${SHORT_KERNEL}.tar.xz; \
+            tar xJf $${KERNEL_TARBALL} -C $${tmpdir} --strip-components 4 linux-source-$${SHORT_KERNEL}/drivers/media/dvb-core/; \
         else \
-       KERNEL_TARBALL=/usr/src/linux-source-$${SHORT_KERNEL}.tar.bz2; \
-       tar xjf $${KERNEL_TARBALL} -C $${tmpdir} --strip-components 5 linux-source-$${SHORT_KERNEL}/drivers/media/dvb/dvb-core/; \
+            KERNEL_TARBALL=/usr/src/linux-source-$${SHORT_KERNEL}.tar.bz2; \
+            if [ $${REPLACED_DVB_KERNEL} -eq 1 ]; then \
+                tar xjf $${KERNEL_TARBALL} -C $${tmpdir} --strip-components 4 linux-source-$${SHORT_KERNEL}/drivers/media/dvb-core/; \
+            else \
+                tar xjf $${KERNEL_TARBALL} -C $${tmpdir} --strip-components 5 linux-source-$${SHORT_KERNEL}/drivers/media/dvb/dvb-core/; \
+            fi; \
         fi; \
        patch -p4 -d $${tmpdir} < $(CURDIR)/debian/linux-3.7.1-dvb-mutex.patch; \
        make -C $${BUILD_DIR} M=$${tmpdir} modules; \

diff --git a/debian/rules.defs b/debian/rules.defs
index 78a422b4e73a50c28ab209fa8ddff2f1264eb017..b0ae96f9127aac5eb978593a525196a0189b7a3f 100644 (file)
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1,5 +1,6 @@
-KERNELS = 3.2.0-4-amd64 3.10-2-amd64
+KERNELS = 3.2.0-4-amd64 3.8-trunk-amd64 3.10-2-amd64
 KERNEL_VERSION_3.2.0-4-amd64 = 3.2.46-1
+KERNEL_VERSION_3.8-trunk-amd64 = 3.8.3-1~experimental.1
 KERNEL_VERSION_3.10-2-amd64 = 3.10.7-1
 
 FFDECSA_FLAVORS = core2 athlon64 atom corei5