[Pkg-dkms-commits] [SCM] Maintainance of the dkms package branch, master, updated. debian/2.0.21.0-1-3-gd8f0a64

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit d8f0a64a66147e1b69d859e18c04fff7e65797d8
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Tue Feb 24 09:44:56 2009 +0100

    Refreshing patches

diff --git a/debian/patches/02-fix_distribution.patch b/debian/patches/02-fix_distribution.patch
index 4beda4e..d664983 100644
--- a/debian/patches/02-fix_distribution.patch
+++ b/debian/patches/02-fix_distribution.patch
@@ -1,11 +1,11 @@
 replace intrepid (Ubuntu) DIST with unstable
 --- a/Makefile
 +++ b/Makefile
-@@ -6,7 +6,7 @@ RELEASE_EXTRALEVEL := .0
+@@ -6,7 +6,7 @@ RELEASE_EXTRALEVEL := .1
  RELEASE_NAME := dkms
  RELEASE_VERSION := $(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL)
  RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_VERSION)
--DIST := intrepid
+-DIST := jaunty
 +DIST := unstable
  SHELL=bash
  
diff --git a/debian/patches/04-use_su-to-root.patch b/debian/patches/04-use_su-to-root.patch
index 34806bf..7cbac7d 100644
--- a/debian/patches/04-use_su-to-root.patch
+++ b/debian/patches/04-use_su-to-root.patch
@@ -1,7 +1,7 @@
 Use su-to-root if available
 --- a/dkms
 +++ b/dkms
-@@ -3088,7 +3088,9 @@ function make_debian()
+@@ -3076,7 +3076,9 @@ function make_debian()
      ROOT=""
      ADMINABLE=""
      if [ "$USER" != "root" ]; then
diff --git a/debian/patches/05-do_not_check_admin_group.patch b/debian/patches/05-do_not_check_admin_group.patch
index 555dc31..cbd8504 100644
--- a/debian/patches/05-do_not_check_admin_group.patch
+++ b/debian/patches/05-do_not_check_admin_group.patch
@@ -1,7 +1,7 @@
 admin group is not a standard group in Debian, so check only if $ROOT is non-null
 --- a/dkms
 +++ b/dkms
-@@ -3076,7 +3076,7 @@ function make_debian()
+@@ -3064,7 +3064,7 @@ function make_debian()
  
      make_common_test "mk${create_type}"
  
@@ -10,7 +10,7 @@ admin group is not a standard group in Debian, so check only if $ROOT is non-nul
  
      SYNAPTIC=""
      #Synaptic availablity
-@@ -3116,7 +3116,7 @@ function make_debian()
+@@ -3104,7 +3104,7 @@ function make_debian()
      #test if we are missing dependencies that are needed during package build
      INSTALL_PACKAGES="`make_debian_test_depends`"
      if [ ! -z "$INSTALL_PACKAGES" ]; then
diff --git a/debian/patches/06-fakeroot.patch b/debian/patches/06-fakeroot.patch
index 41dcb93..723838c 100644
--- a/debian/patches/06-fakeroot.patch
+++ b/debian/patches/06-fakeroot.patch
@@ -1,7 +1,7 @@
 Do not use fakeroot for source-only build, and use -rfakeroot for binary build
 --- a/dkms
 +++ b/dkms
-@@ -3210,11 +3210,11 @@ function make_debian()
+@@ -3198,11 +3198,11 @@ function make_debian()
      pushd "$temp_dir_debian" > /dev/null 2>&1
      case "$create_type" in
          dsc)
diff --git a/debian/patches/07-exit-if-build-fails.patch b/debian/patches/07-exit-if-build-fails.patch
index 0a7ae26..720c780 100644
--- a/debian/patches/07-exit-if-build-fails.patch
+++ b/debian/patches/07-exit-if-build-fails.patch
@@ -1,7 +1,7 @@
 Fix exit when build fails
 --- a/dkms
 +++ b/dkms
-@@ -3211,10 +3211,27 @@ function make_debian()
+@@ -3199,10 +3199,27 @@ function make_debian()
      case "$create_type" in
          dsc)
              invoke_command "dpkg-buildpackage -S -us -uc 1>/dev/null" "Building source package"
@@ -29,7 +29,7 @@ Fix exit when build fails
              invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
              ;;
      esac
-@@ -3230,12 +3247,9 @@ function make_debian()
+@@ -3218,12 +3235,9 @@ function make_debian()
      delete_temporary_trees
  
      #done

-- 
Maintainance of the dkms package