[Pkg-phototools-devel] [enblend cvs 4/5] Add debian/README.dfsgify, describing how the tarball was built. (This also includes instructions for patching m4/ax_check_glut.m4 to get rid of unnecesary linking against -lICE -lSM -lXmu -lXi.

[Andreas Metzler]

---
 debian/README.dfsgify |   69 +++++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog      |    3 ++
 2 files changed, 72 insertions(+), 0 deletions(-)
 create mode 100644 debian/README.dfsgify

diff --git a/debian/README.dfsgify b/debian/README.dfsgify
new file mode 100644
index 0000000..f5504ba
--- /dev/null
+++ b/debian/README.dfsgify
@@ -0,0 +1,69 @@
+Pull stuff from CVS and remove CVS subdirs.
+
+Prune win32.
+rm -rf src/win32helpers win32
+
+change configure.in and src/Makefile.am to not refer to src/win32helpers
+anymore.
+-----------------------------
+--- enblend/configure.in	2008-02-08 07:44:53.000000000 +0100
++++ enblend-dfsg/configure.in	2008-08-02 12:06:53.000000000 +0200
+@@ -140,8 +140,7 @@
+                  include/vigra/Makefile
+                  include/vigra_ext/Makefile
+                  src/Makefile
+-                 src/vigra_impex/Makefile
+-                 src/win32helpers/Makefile])
++                 src/vigra_impex/Makefile])
+ AC_OUTPUT
+ 
+ AC_MSG_RESULT([
+--- enblend/src/Makefile.am	2008-02-08 07:44:53.000000000 +0100
++++ enblend-dfsg/src/Makefile.am	2008-08-02 12:06:01.000000000 +0200
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = enblend.vcproj enblend_msvc2003.vcproj enblend_msvc2008.vcproj enfuse_msvc2003.vcproj enfuse_msvc2003.vcproj
+-SUBDIRS = vigra_impex win32helpers
++SUBDIRS = vigra_impex
+ bin_PROGRAMS = enblend enfuse
+ enblend_SOURCES = anneal.h assemble.h blend.h bounds.h common.h enblend.h enblend.cc fixmath.h float_cast.h gpu.cc gpu.h mask.h nearest.h numerictraits.h path.h pyramid.h
+ enblend_LDFLAGS = -ffast-math
+-----------------------------
+
+Fix ./m4/ax_check_glut.m4 to not add unnecessary linkage to -lXmu and -lXi.
+
+-----------------------------
+--- ./enblend/m4/ax_check_glut.m4    2007-08-04 12:39:18.000000000 +0200
++++ ./enblend+dfsg/m4/ax_check_glut.m4  2008-08-02 17:48:25.000000000 +0200
+@@ -29,7 +29,7 @@
+   # If X is present, assume GLUT depends on it.
+   #
+   if test "X${no_x}" != "Xyes"; then
+-    GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"
++    GLUT_LIBS="${X_PRE_LIBS} ${X_EXTRA_LIBS} ${GLUT_LIBS}"
+   fi
+
+   AC_LANG_PUSH(C)
+-----------------------------
+
+It also not necessary to link against -lICE -lSM for GLUT on Linux:
+-----------------------------
+--- enblend/m4/ax_check_glut.m4    2008-08-02 18:10:46.000000000 +0200
++++ enblend+dfsg/m4/ax_check_glut.m4  2008-08-02 18:10:38.000000000 +0200
+@@ -16,7 +16,7 @@
+
+ AC_DEFUN([AX_CHECK_GLUT],
+ [AC_REQUIRE([AX_CHECK_GLU])dnl
+-AC_REQUIRE([AC_PATH_XTRA])dnl
++dnl #not needed on linux AC_REQUIRE([AC_PATH_XTRA])dnl
+
+ if test "X$with_apple_opengl_framework" = "Xyes"; then
+   GLUT_CFLAGS="${GLU_CFLAGS}"
+-----------------------------
+
+Install automake, build-depends and autoconf-archive
+
+aclocal -I m4 -I /usr/share/autoconf-archive && \
+	autoheader -f && automake --add-missing -c -f && \
+	autoconf && rm -rf autom4te.cache/ config.h.in~
+
+Use tar to generate the tarball.
diff --git a/debian/changelog b/debian/changelog
index cd7c11c..636e5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ enblend (3.1~cvs20080801+dfsg-0.1) experimental; urgency=low
       although they currently would be pulled in by other build-depends.
     + Add libopenexr-dev and pkg-config.
   * (Mindless) update of debian/patches/type_mismatch.dpatch.
+  * Add debian/README.dfsgify, describing how the tarball was built.
+  * Patch m4/ax_check_glut.m4 to get rid of unnecesary linking against -lICE
+    -lSM -lXmu -lXi.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 02 Aug 2008 13:21:46 +0200
 
-- 
1.5.6.3