[Debian-astro-commits] [saods9] 03/03: Re-sort patches: First the common ones, then the special ones

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository saods9.

commit 00da37cf41e142ae2a8f0e94f8b3ea0dfa100a37
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 17 14:01:58 2015 +0200

    Re-sort patches: First the common ones, then the special ones
---
 debian/patches/ds9_use_tcltk_packages.patch |  4 ++--
 debian/patches/saotk_use_system_libs.patch  |  2 +-
 debian/patches/series                       | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index f87c181..184cd0e 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -165,14 +165,14 @@ Description: Don't load TclTk extensions as shared libs, but as packages
  #--------------------------------------------------------------------
 --- a/saotk/configure.in
 +++ b/saotk/configure.in
-@@ -356,7 +356,7 @@
+@@ -375,7 +375,7 @@
  # link against the non-stubbed Tcl library.  Add Tk too if necessary.
  #--------------------------------------------------------------------
  
 -AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
 +#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
  #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
- SHLIB_LD_LIBS='${LIBS} -lstdc++ -lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2'
+ SHLIB_LD_LIBS='${LIBS} -lstdc++'
  
 --- a/tclcheckdns1.1/checkdns.C
 +++ b/tclcheckdns1.1/checkdns.C
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index 8d073e7..b7eb151 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -77,7 +77,7 @@ Description: Compile against system library wcstools
  widget/truecolor8.C
 @@ -377,7 +358,7 @@
  
- AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
  #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
 -SHLIB_LD_LIBS='${LIBS} -lstdc++'
 +SHLIB_LD_LIBS='${LIBS} -lstdc++ -lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2'
diff --git a/debian/patches/series b/debian/patches/series
index c2cdf16..184275c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,3 @@
-htmlwidget.patch
-iis.patch
-saotk_fix_blt_crash.patch
-saotk_add_ksearch.patch
-saotk_add_psscale.patch
-saotk_avoid_compile_warnings.patch
-saotk_use_system_libs.patch
-saotk_spellfix.patch
 ds9_make_linux.patch
 ds9_use_filesystem.patch
 ds9_use_shared_libs.patch
@@ -14,3 +6,11 @@ ds9_support_blt.patch
 ds9_fix_docdir.patch
 ds9_optional_doc_package.patch
 ds9_add_about_debian.patch
+saotk_fix_blt_crash.patch
+saotk_add_ksearch.patch
+saotk_add_psscale.patch
+saotk_avoid_compile_warnings.patch
+saotk_use_system_libs.patch
+saotk_spellfix.patch
+htmlwidget.patch
+iis.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git