[med-svn] r15696 - in trunk/packages/anfo/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-01-01 17:46:55 +0000 (Wed, 01 Jan 2014)
New Revision: 15696

Added:
   trunk/packages/anfo/trunk/debian/patches/
   trunk/packages/anfo/trunk/debian/patches/autoreconf.patch
   trunk/packages/anfo/trunk/debian/patches/series
Modified:
   trunk/packages/anfo/trunk/debian/changelog
   trunk/packages/anfo/trunk/debian/control
   trunk/packages/anfo/trunk/debian/rules
Log:
use autoreconf (including necessary patches)


Modified: trunk/packages/anfo/trunk/debian/changelog
===================================================================
--- trunk/packages/anfo/trunk/debian/changelog	2014-01-01 17:05:30 UTC (rev 15695)
+++ trunk/packages/anfo/trunk/debian/changelog	2014-01-01 17:46:55 UTC (rev 15696)
@@ -7,6 +7,7 @@
      - debhelper 9
      - canonical Vcs fields
   * debian/copyright: DEP5
+  * use autoreconf (including necessary patches)
 
  -- Andreas Tille <tille at debian.org>  Wed, 01 Jan 2014 17:55:33 +0100
 

Modified: trunk/packages/anfo/trunk/debian/control
===================================================================
--- trunk/packages/anfo/trunk/debian/control	2014-01-01 17:05:30 UTC (rev 15695)
+++ trunk/packages/anfo/trunk/debian/control	2014-01-01 17:46:55 UTC (rev 15696)
@@ -12,7 +12,8 @@
                zlib1g-dev,
                libbz2-dev,
                pkg-config,
-               protobuf-compiler
+               protobuf-compiler,
+               dh-autoreconf
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/anfo/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/anfo/trunk/

Added: trunk/packages/anfo/trunk/debian/patches/autoreconf.patch
===================================================================
--- trunk/packages/anfo/trunk/debian/patches/autoreconf.patch	                        (rev 0)
+++ trunk/packages/anfo/trunk/debian/patches/autoreconf.patch	2014-01-01 17:46:55 UTC (rev 15696)
@@ -0,0 +1,39 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 01 Jan 2014 17:55:33 +0100
+Description: Enable using autoreconf
+
+--- anfo-0.98.orig/src/Makefile.am
++++ anfo-0.98/src/Makefile.am
+@@ -15,8 +15,8 @@
+ BUILT_SOURCES = config.pb.h output.pb.h config.pb.cc output.pb.cc
+ CLEANFILES = config.pb.h output.pb.h config.pb.cc output.pb.cc anfo.scm
+ 
+-CFLAGS += $(protobuf_CFLAGS)
+-CXXFLAGS += $(protobuf_CFLAGS)
++AM_CFLAGS = $(protobuf_CFLAGS)
++AM_CXXFLAGS = $(protobuf_CFLAGS)
+ LDADD = libanfo.la
+ 
+ libanfo_la_LDFLAGS = -version-info 0:0:0
+@@ -40,10 +40,10 @@
+ 	sed -e "s#__LIBDIR__#$(libdir)#g" < $(srcdir)/anfo.scm.in >> anfo.scm
+ 
+ config.pb.cc: config.proto
+-	$(PROTOC) -I. -I$(dir $(PROTOC))../include --cpp_out=. config.proto
++	protoc -I. -I/usr/include --cpp_out=. config.proto
+ 
+ output.pb.cc: output.proto
+-	$(PROTOC) -I. -I$(dir $(PROTOC))../include --cpp_out=. output.proto
++	protoc -I. -I/usr/include --cpp_out=. output.proto
+ 
+ config.pb.h: config.pb.cc
+ 	@:
+--- anfo-0.98.orig/configure.ac
++++ anfo-0.98/configure.ac
+@@ -72,3 +72,6 @@
+ 		 src/Makefile
+ 		 ])
+ AC_OUTPUT
++
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR

Added: trunk/packages/anfo/trunk/debian/patches/series
===================================================================
--- trunk/packages/anfo/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/anfo/trunk/debian/patches/series	2014-01-01 17:46:55 UTC (rev 15696)
@@ -0,0 +1 @@
+autoreconf.patch

Modified: trunk/packages/anfo/trunk/debian/rules
===================================================================
--- trunk/packages/anfo/trunk/debian/rules	2014-01-01 17:05:30 UTC (rev 15695)
+++ trunk/packages/anfo/trunk/debian/rules	2014-01-01 17:46:55 UTC (rev 15696)
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh  $@
+	dh  $@ --with autoreconf
 
 # ./scm files should not be executable
 override_dh_fixperms :