r744 - in /trunk/boinc-app-seti/debian: changelog patches/003_dont_use_own_jpeglib.patch patches/series

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Sat Nov 17 14:58:03 2007
New Revision: 744

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=744
Log:
* Updated 003_dont_use_own_jpeglib.patch for the new snapshot from 20071114.
* Commented all other patches in debian/patches/series. 001_build_fixes.patch
  and 004_include_new_str_util.h.patch are not required anymore, but I haven't
  looked at 002_disable_static_linkage.patch yet (it probably need to be
  adapted for the new version).
* Set upstream version in latest changelog entry to 5.28.

Modified:
    trunk/boinc-app-seti/debian/changelog
    trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch
    trunk/boinc-app-seti/debian/patches/series

Modified: trunk/boinc-app-seti/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/changelog?rev=744&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/changelog (original)
+++ trunk/boinc-app-seti/debian/changelog Sat Nov 17 14:58:03 2007
@@ -1,11 +1,11 @@
-boinc-app-seti (5.13+cvs20071114-1) UNRELEASED; urgency=low
+boinc-app-seti (5.28+cvs20071114-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
   * boinc-app-seti: wrote debian/rules get-orig-source target (Steffen
     Moeller)
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 17 Oct 2007 15:01:58 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Fri, 16 Nov 2007 23:32:41 +0100
 
 boinc-app-seti (5.13+cvs20060510-3) unstable; urgency=low
 

Modified: trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch?rev=744&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch (original)
+++ trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch Sat Nov 17 14:58:03 2007
@@ -2,10 +2,10 @@
 will be linked against libjpeg. If the package should be configured with
 "--enable-graphics" this needs to be uncommented.
 
-Index: boinc-app-seti-5.13+cvs20060510/Makefile.am
+Index: boinc-app-seti-5.28+cvs20071114/Makefile.am
 ===================================================================
---- boinc-app-seti-5.13+cvs20060510.orig/Makefile.am	2005-10-26 20:23:03.000000000 +0200
-+++ boinc-app-seti-5.13+cvs20060510/Makefile.am	2007-07-19 14:10:04.000000000 +0200
+--- boinc-app-seti-5.28+cvs20071114.orig/Makefile.am
++++ boinc-app-seti-5.28+cvs20071114/Makefile.am
 @@ -28,7 +28,7 @@
  endif
  
@@ -15,20 +15,20 @@
  
  dist-hook:
  	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
-Index: boinc-app-seti-5.13+cvs20060510/configure.ac
+Index: boinc-app-seti-5.28+cvs20071114/configure.ac
 ===================================================================
---- boinc-app-seti-5.13+cvs20060510.orig/configure.ac	2007-07-19 14:10:04.000000000 +0200
-+++ boinc-app-seti-5.13+cvs20060510/configure.ac	2007-07-19 14:10:41.000000000 +0200
-@@ -195,7 +195,7 @@
-     AC_DEFINE([HAVE_LIBSOCKET],[1],[Define to 1 if you have the socket library]))
+--- boinc-app-seti-5.28+cvs20071114.orig/configure.ac
++++ boinc-app-seti-5.28+cvs20071114/configure.ac
+@@ -204,7 +204,7 @@
+     AC_DEFINE([HAVE_LIBGCC_S],[1],[Define to 1 if you have the gcc_s library]))
+ SAH_CHECK_LIB([stdc++],[sscanf],
+     AC_DEFINE([HAVE_LIBSTDC__],[1],[Define to 1 if you have the stdc++ library]))
+-SAH_CHECK_JPEGLIB
++#SAH_CHECK_JPEGLIB
  SAH_CHECK_LIB([z], [uncompress], 
      AC_DEFINE([HAVE_LIBZ],[1],[Define to 1 if you have the z library]))
--SAH_CHECK_JPEGLIB
-+#SAH_CHECK_JPEGLIB
- SAH_CHECK_LIB([stdc++],[sscanf],
-     AC_DEFINE([HAVE_LIBSTDC__],[1],[Define to 1 if you have the stdc++ library]))
- SAH_CHECK_LIB([gcc_eh],[_Unwind_Resume], 
-@@ -315,6 +315,7 @@
+ SAH_CHECK_LIB([socket], [bind], 
+@@ -361,6 +361,7 @@
  AH_TEMPLATE([HAVE_STD_TRANSFORM],[Define to 1 if transform is in namespace std::])
  SAH_FUNCS_IN_NAMESPACE([['min(0,0)'] ['max(0,0)'] ['transform((char *)0,(char *)0,(char *)0,(int(*)(int))malloc)']],std)
  
@@ -36,7 +36,7 @@
  AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
  AM_CONDITIONAL(USE_MY_GLUT, [false])
  AM_CONDITIONAL(ENABLE_SERVER, [test "${enable_server}" = yes])
-@@ -360,7 +361,6 @@
+@@ -413,7 +414,6 @@
  ])
  
  AC_CONFIG_FILES([Makefile

Modified: trunk/boinc-app-seti/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/series?rev=744&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/series (original)
+++ trunk/boinc-app-seti/debian/patches/series Sat Nov 17 14:58:03 2007
@@ -1,4 +1,4 @@
-001_build_fixes.patch
-002_disable_static_linkage.patch
+#001_build_fixes.patch
+#002_disable_static_linkage.patch
 003_dont_use_own_jpeglib.patch
-004_include_new_str_util.h.patch
+#004_include_new_str_util.h.patch