use dh-autoreconf

diff --git a/debian/changelog b/debian/changelog
index 7d182cbad43905ea863475e13cfd3a6733c60c69..7c7f7a0d720fbca76ce36d5aa512e6e1e10ff4d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ cdck (0.7.0+dfsg-1) UNRELEASED; urgency=low
   * Repack upstream tarball to exclude precompiled binary and auto(re)conf
     artifacts.
   * Update package to use dh-autoreconf.
+  * Drop ltmain.sh patch.  Use dh-autoreconf.
 
  -- gregor herrmann <gregoa@debian.org>  Sun, 08 Jan 2012 20:55:14 +0100
 

diff --git a/debian/control b/debian/control
index 4325c70b131619276a744f182060641548793273..508535f3c2be2c14075b529f1ecf32494a4a81b4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: tony mancill <tmancill@debian.org>
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               autotools-dev
+               dh-autoreconf
 Standards-Version: 3.9.6
 Vcs-Browser: http://git.toastfreeware.priv.at/debian/cdck.git/
 Vcs-Git: git://git.toastfreeware.priv.at/debian/cdck.git

diff --git a/debian/patches/makefile.am.patch b/debian/patches/makefile.am.patch
new file mode 100644 (file)
index 0000000..b4e25be
--- /dev/null
+++ b/debian/patches/makefile.am.patch
@@ -0,0 +1,28 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0dca98f..ccee7b5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,12 +10,12 @@ CLEANFILES = *~ *.o *.la *.lo *.a
+ EXTRA_DIST = config.h cdck template.plot template-ps.plot
+ 
+ INCLUDES = @CPPFLAGS@
+-CFLAGS =  @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\"
++AM_CFLAGS =  @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\"
+ 
+ CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 
+ lib_LTLIBRARIES  = libcdck.la
+-noinst_LIBRARIES = libcdck.a
++#noinst_LIBRARIES = libcdck.a
+ 
+ LIBCDCK_SRCS =                \
+       lib_main.cpp    \
+@@ -28,7 +28,7 @@ LIBCDCK_SRCS =               \
+       lib_cdinfo.h
+ 
+ libcdck_la_SOURCES = $(LIBCDCK_SRCS)
+-libcdck_a_SOURCES  = $(LIBCDCK_SRCS)
++#libcdck_a_SOURCES  = $(LIBCDCK_SRCS)
+ 
+ bin_PROGRAMS = cdck
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 827157455799d3291b074a8f924dfd717beb0019..9cae091ff3dd74da6a3d99a8be48efd67d91c77a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 man.patch
-libtool.patch
+#libtool.patch
 wording.patch
 hurd.patch
+makefile.am.patch

diff --git a/debian/rules b/debian/rules
index f528aa2510cff7a303245f581c7683d085790b38..be14f55bed1a2a7dcc22c2cbf3742429255fa2da 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 export CONFIG_SHELL=/bin/bash
 
 %:
-       dh $@ --with autotools_dev
+       #dh $@ --with autotools_dev
+       dh $@ --with autoreconf
 
 override_dh_auto_build:
        dh_auto_build -- -j1