Remove old scons overrides from d/rules.

Build-Depend on autotools-dev and pkg-config instead of scons.
Set --sbindir=/sbin to stay consistent with the current install location.

diff --git a/debian/changelog b/debian/changelog
index 6f04140839e7b204ef47ab4b21e9a890c331e7f7..f2ca349c638c77e8c55f94d83b27fdc48bed794e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ exfat-utils (1.2.1-1) unstable; urgency=low
   * New upstream release.
     + Changes from scons to autotools
   * Remove d/install, no longer required.
   * New upstream release.
     + Changes from scons to autotools
   * Remove d/install, no longer required.

+  * Remove old scons overrides from d/rules.
+  * Build-Depend on autotools-dev and pkg-config instead of scons.
+  * Set --sbindir=/sbin to stay consistent with the current install location.

 
  --
 
 
  --
 

diff --git a/debian/control b/debian/control
index 9b1b4423ac71bb7a4e53be65991aafc175bc7bc0..25863c5eede5cfc47ffb2c0b71b93a4af80b6db9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: exfat-utils
 Section: otherosfs
 Priority: optional
 Maintainer: Sven Hoexter <hoexter@debian.org>
 Section: otherosfs
 Priority: optional
 Maintainer: Sven Hoexter <hoexter@debian.org>

-Build-Depends: debhelper (>= 9), scons
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config

 Standards-Version: 3.9.6
 Homepage: http://code.google.com/p/exfat/
 Vcs-Git: git://git.sven.stormbind.net/git/sven/exfat-utils.git
 Standards-Version: 3.9.6
 Homepage: http://code.google.com/p/exfat/
 Vcs-Git: git://git.sven.stormbind.net/git/sven/exfat-utils.git

diff --git a/debian/rules b/debian/rules
index 9f7d91a353fc3c6045112df2df7eda5b7fdec914..ec620f7863d45ca44fd5efed01c3b69c9ad5e012 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

-export CCFLAGS = $(CFLAGS) -Wall -std=c99 -D_GNU_SOURCE

 
 %:
 
 %:

-       dh $@
+       dh $@ --with autotools_dev

 
 

-override_dh_auto_build:
-       scons
-
-override_dh_auto_clean:
-       scons -c
-       rm -f config.log
+override_dh_auto_configure:
+       dh_auto_configure -- \
+               --sbindir=/sbin \