[SCM] image display tool for astronomy branch, debian, updated. f08dc919705538b898537d6b24855a7e7f7542b7

Ole Streicher debian at liska.ath.cx
Thu Jun 7 13:02:46 UTC 2012


The following commit has been merged in the debian branch:
commit f08dc919705538b898537d6b24855a7e7f7542b7
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 7 15:00:08 2012 +0200

    Rename and reorder patches
    
    The first part of the name is now the subpackage, or "ds9" if it is applied
    to the top dir, src/ or ds9/.
    
    The order corresponds to the build order in debian/rules

diff --git a/debian/patches/fix_blt.patch b/debian/patches/blt_fix_crash.patch
similarity index 100%
rename from debian/patches/fix_blt.patch
rename to debian/patches/blt_fix_crash.patch
diff --git a/debian/patches/remove_blt_rpath.patch b/debian/patches/blt_remove_rpath.patch
similarity index 100%
rename from debian/patches/remove_blt_rpath.patch
rename to debian/patches/blt_remove_rpath.patch
diff --git a/debian/patches/add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
similarity index 100%
rename from debian/patches/add_about_debian.patch
rename to debian/patches/ds9_add_about_debian.patch
diff --git a/debian/patches/fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
similarity index 100%
rename from debian/patches/fix_docdir.patch
rename to debian/patches/ds9_fix_docdir.patch
diff --git a/debian/patches/make_linux.patch b/debian/patches/ds9_make_linux.patch
similarity index 100%
rename from debian/patches/make_linux.patch
rename to debian/patches/ds9_make_linux.patch
diff --git a/debian/patches/optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
similarity index 100%
rename from debian/patches/optional_doc_package.patch
rename to debian/patches/ds9_optional_doc_package.patch
diff --git a/debian/patches/use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
similarity index 100%
rename from debian/patches/use_external_libs.patch
rename to debian/patches/ds9_use_external_libs.patch
diff --git a/debian/patches/use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
similarity index 100%
rename from debian/patches/use_filesystem.patch
rename to debian/patches/ds9_use_filesystem.patch
diff --git a/debian/patches/add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
similarity index 100%
rename from debian/patches/add_ksearch.patch
rename to debian/patches/saotk_add_ksearch.patch
diff --git a/debian/patches/add_missing_grf.patch b/debian/patches/saotk_add_missing_grf.patch
similarity index 100%
rename from debian/patches/add_missing_grf.patch
rename to debian/patches/saotk_add_missing_grf.patch
diff --git a/debian/patches/add_psscale.patch b/debian/patches/saotk_add_psscale.patch
similarity index 100%
rename from debian/patches/add_psscale.patch
rename to debian/patches/saotk_add_psscale.patch
diff --git a/debian/patches/avoid_compile_warnings_saotk.patch b/debian/patches/saotk_avoid_compile_warnings.patch
similarity index 100%
rename from debian/patches/avoid_compile_warnings_saotk.patch
rename to debian/patches/saotk_avoid_compile_warnings.patch
diff --git a/debian/patches/fix_funtools_includes.patch b/debian/patches/saotk_fix_funtools_includes.patch
similarity index 100%
rename from debian/patches/fix_funtools_includes.patch
rename to debian/patches/saotk_fix_funtools_includes.patch
diff --git a/debian/patches/fix_wcstools_includes.patch b/debian/patches/saotk_fix_wcstools_includes.patch
similarity index 100%
rename from debian/patches/fix_wcstools_includes.patch
rename to debian/patches/saotk_fix_wcstools_includes.patch
diff --git a/debian/patches/spellfix.patch b/debian/patches/saotk_spellfix.patch
similarity index 100%
rename from debian/patches/spellfix.patch
rename to debian/patches/saotk_spellfix.patch
diff --git a/debian/patches/series b/debian/patches/series
index f2360bd..5a72798 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,18 @@
 checkdns.patch
-iis.patch
-add_ksearch.patch
-add_psscale.patch
-avoid_compile_warnings_saotk.patch
-fix_wcstools_includes.patch
-fix_funtools_includes.patch
-use_external_libs.patch
-make_linux.patch
-use_filesystem.patch
-fix_blt.patch
-fix_docdir.patch
-spellfix.patch
-add_about_debian.patch
-remove_blt_rpath.patch
 htmlwidget.patch
-optional_doc_package.patch
+iis.patch
+blt_fix_crash.patch
+blt_remove_rpath.patch
+saotk_add_ksearch.patch
+saotk_add_psscale.patch
+saotk_avoid_compile_warnings.patch
+saotk_fix_wcstools_includes.patch
+saotk_fix_funtools_includes.patch
+saotk_spellfix.patch
+ds9_use_external_libs.patch
+ds9_make_linux.patch
+ds9_use_filesystem.patch
+ds9_fix_docdir.patch
+ds9_add_about_debian.patch
+ds9_optional_doc_package.patch
 
diff --git a/debian/rules b/debian/rules
index 357124f..263aab2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-BUILDPARTS:=dirs blt checkdns tkmpeg html iis rice hcompress plio unix saotk ds9
+BUILDPARTS:=dirs checkdns tkmpeg html iis rice hcompress plio unix blt saotk ds9
 
 get-orig-source:
 	sh ./debian/repack;

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list