r130 - in /packages/swftools/trunk: debian/control debian/patches/00list debian/patches/03_configure.dpatch debian/rules lib/

swk-guest at users.alioth.debian.org swk-guest at users.alioth.debian.org
Sat Jun 30 15:52:39 UTC 2007 

Author: swk-guest
Date: Sat Jun 30 15:52:39 2007
New Revision: 130

URL: http://svn.debian.org/wsvn/?sc=1&rev=130
Log:
* removed the unnecessary lib/swf/Makefile
* debian/control: changed the dependencies of python2.4-rfxswf from hard coded to ${shlibs:Depends}, ${misc:Depends}, python-imaging; (Bug #427834)
* debian/patches/03_configure.dpatch: removed the work around for the gcc 2.95 check, fixed in upstream
* debian/patches/00list: updated the comments
* debian/rules: added lib/swf/Makefile to target clean-patched
* debian/rules: removed -XSWF.so from dh_shlibdeps to get the correct dependencies for python2.4-rfxswf; (Bug #427834)

Removed:
    packages/swftools/trunk/lib/
Modified:
    packages/swftools/trunk/debian/control
    packages/swftools/trunk/debian/patches/00list
    packages/swftools/trunk/debian/patches/03_configure.dpatch
    packages/swftools/trunk/debian/rules

Modified: packages/swftools/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/swftools/trunk/debian/control?rev=130&op=diff
==============================================================================
--- packages/swftools/trunk/debian/control (original)
+++ packages/swftools/trunk/debian/control Sat Jun 30 15:52:39 2007
@@ -39,7 +39,7 @@
 Package: python2.4-rfxswf
 Section: python
 Architecture: any
-Depends: libc6 (>= 2.3.6.ds1-8), libfontconfig1 (>= 2.4.2-1), libfreetype6 (>= 2.2.1-5), libjpeg62, libt1-5 (>= 5.1.0-2), libungif4g (>= 4.1.4-4), zlib1g (>= 1:1.2.3-13), libexpat1 (>= 1.95.8-3.3), python2.4 (>= 2.4.4-2), python-imaging (>= 1.1.5-11)
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-imaging (>= 1.1.5-11)
 Description: Python wrapper for the rfxswf library
  RFXSWF library is a fully featured library which can be used for standalone
  SWF generation. It includes support for Bitmaps, Buttons, Shapes, Text, Fonts,

Modified: packages/swftools/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/packages/swftools/trunk/debian/patches/00list?rev=130&op=diff
==============================================================================
--- packages/swftools/trunk/debian/patches/00list (original)
+++ packages/swftools/trunk/debian/patches/00list Sat Jun 30 15:52:39 2007
@@ -4,12 +4,12 @@
 01_manpages.dpatch
 #------------------------------------------------------------------------
 # FAQ
-# Removed the compilation and installation related questions until
-# the FAQ is split in to two seaprate FAQs.
+# - Removed the compilation and installation related questions until
+#   the FAQ is split in to two seaprate FAQs.
 02_faq.dpatch
 #------------------------------------------------------------------------
 # Configure
-# - Ran aclocal and autoconf from automake 1.9 and autoconf 2.59
+# - Ran aclocal and autoconf from automake 1.10 and autoconf 2.61
 03_configure.dpatch
 #------------------------------------------------------------------------
 # Makefile fixes

Modified: packages/swftools/trunk/debian/patches/03_configure.dpatch
URL: http://svn.debian.org/wsvn/packages/swftools/trunk/debian/patches/03_configure.dpatch?rev=130&op=diff
==============================================================================
--- packages/swftools/trunk/debian/patches/03_configure.dpatch (original)
+++ packages/swftools/trunk/debian/patches/03_configure.dpatch Sat Jun 30 15:52:39 2007
@@ -4,77 +4,19 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: This patch patches the configure script, which was generated
 ## DP: by running the latest aclocal and autoconf.
-## DP: The upstream package does not have all the m4 files in the
-## DP: tar ball, so this is probably a better way than trying to create
-## DP: the configure script at build time.
-## DP: Disabled the failing checking for gcc 2.95 as we depend on
-## DP: gcc >=4.1.1
+## DP: The only difference to the upstream is the avifile-config,
+## DP: which gives rpath (see bug #347536).
 
 @DPATCH@
 diff -urNad swftools-0.8.1~/configure swftools-0.8.1/configure
---- swftools-0.8.1~/configure	2007-03-04 09:30:58.000000000 +0200
-+++ swftools-0.8.1/configure	2007-03-04 09:34:54.000000000 +0200
-@@ -3250,7 +3250,7 @@
- { echo "$as_me:$LINENO: checking whether gcc supports lazy variable declaration" >&5
- echo $ECHO_N "checking whether gcc supports lazy variable declaration... $ECHO_C" >&6; }
- 
--cat > conftest.c << EOF
-+cat > conftest.cpp << EOF
- #include <stdlib.h>
- #include <stdio.h>
- 
-@@ -3264,21 +3264,22 @@
- }
- EOF
- 
--testprog_link='$CC $CPPFLAGS $CFLAGS conftest.c -o conftest${ac_exeext}'
--if { (eval echo gcc.2.95.m4:19: \"$testprog_link\") 1>&5; (eval $testprog_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+testprog_link='$CC $CPPFLAGS $CFLAGS conftest.cpp -o conftest${ac_exeext}'
-+if { (eval echo gcc.2.95.m4:19: \"$testprog_link\") 1>&5; (eval $testprog_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest${ac_exeext}; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-   GCC_IS_OK=true
-   export GCC_IS_OK
- else
-   echo "configure: failed program was:" >&5
--  cat conftest.c >&5
-+  cat conftest.cpp >&5
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
- rm -f conftest*
- 
- 
-+export GCC_IS_OK=true
- if test "x$GCC_IS_OK" '=' "x";then
-     echo "***************************************************"
-     echo "* Your gcc is too old to compile this!"
-@@ -3896,7 +3897,7 @@
- #define WIN32 1
- _ACEOF
- 
--	LIBS="$LIBS -lws2_32 -lgdi32"
-+	LIBS="$LIBS -lws2_32"
- 	{ echo "$as_me:$LINENO: result: mingw" >&5
- echo "${ECHO_T}mingw" >&6; }
-     else
-@@ -8921,10 +8922,6 @@
- _ACEOF
- 
- 	cat >>confdefs.h <<_ACEOF
--#define HAVE_FREETYPE_FREETYPE_H 1
--_ACEOF
--
--	cat >>confdefs.h <<_ACEOF
- #define USE_FREETYPE 1
- _ACEOF
-   # for ttf2tp1
-@@ -9479,7 +9476,7 @@
+--- swftools-0.8.1~/configure	2007-05-07 17:56:43.000000000 +0300
++++ swftools-0.8.1/configure	2007-05-07 17:58:39.000000000 +0300
+@@ -9479,7 +9479,7 @@
  EOF
  
  if test "x$AVIFILE_CONFIG" '!=' "x";then
 -    AVIFILE_LIBS=`$AVIFILE_CONFIG --libs`
-+    AVIFILE_LIBS=`$AVIFILE_CONFIG --libs |sed 's/-Wl,-rpath,^:space:*//g'`
++    AVIFILE_LIBS=`$AVIFILE_CONFIG --libs |sed 's/-Wl,-rpath,\/usr\/lib\ //g'`
      AVIFILE_CFLAGS=`$AVIFILE_CONFIG --cflags`
      avifile_link='$CXX $CPPFLAGS $CXXFLAGS $AVIFILE_CFLAGS conftest.cpp $AVIFILE_LIBS -o conftest${ac_exeext}'
      if { (eval echo avi2swf.m4:71: \"$avifile_link\") 1>&5; (eval $avifile_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest${ac_exeext}; then

Modified: packages/swftools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/swftools/trunk/debian/rules?rev=130&op=diff
==============================================================================
--- packages/swftools/trunk/debian/rules (original)
+++ packages/swftools/trunk/debian/rules Sat Jun 30 15:52:39 2007
@@ -98,7 +98,7 @@
 	rm -f lib/h.263/*.o
 	rm -f lib/devices/*.o
 	# These should be cleaned by the main Makefile
-	rm -f config.log lib/action/Makefile lib/art/Makefile swfs/Makefile lib/pdf/Makefile
+	rm -f config.log lib/action/Makefile lib/art/Makefile swfs/Makefile lib/pdf/Makefile lib/swf/Makefile
 	# Remove our own stuff
 	rm -rf lib/python/usr
 	rm -f config.guess config.sub
@@ -162,7 +162,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_shlibdeps -XSWF.so
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

More information about the pkg-flash-devel mailing list