Import Debian changes 5e5-1debian/5e5-1

scm (5e5-1) unstable; urgency=low

  * New upstream release.
  * continue.h: Repeat change from 5e1-2.
  * xgen.scm: Repeat change from 5e2-4.
  * scm.1: Repeat change from 5e2-4.
  * build.scm: Repeat change from 5e3-5.
  * Makefile: Repeat change from 5e3-2.
  * debian/control (Build-Depends): Require at least version 3b1 of slib.
  (scm Depends): Likewise.
  (libscm-dev Depends): Likewise.
    
  * Makefile (scm.info): Add explicit dependency on features.txi and
    platform.txi.  For some reason the one through $(texifiles) is 
    failing mysteriously.  Perhaps this is a make bug.

1 files changed, 16 insertions, 10 deletions

diff --git a/scm.nsi b/scm.nsi
index 0c06fc6..1954b05 100644
--- a/scm.nsi
+++ b/scm.nsi
@@ -4,8 +4,8 @@
 ; placed in the public domain

 

 ; *** version numbers ***

-!define PRODUCT_VERSION "5e4-1"

-!define REQ_SLIB_VERSION "3a5-1"

+!define PRODUCT_VERSION "5e5-1"

+!define REQ_SLIB_VERSION "3b1-1"

 

 ; ----------------[ NO CHANGES BELOW ]----------------

 

@@ -32,7 +32,7 @@
 

 ; MUI Settings

 !define MUI_ABORTWARNING

-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"

+!define MUI_ICON "SCM.ico"

 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"

 

 ; Welcome page

@@ -68,7 +68,7 @@ var ICONS_GROUP
 ; MUI end ------

 

 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"

-OutFile "SCM-${PRODUCT_VERSION}.exe"

+OutFile "scm-${PRODUCT_VERSION}.exe"

 InstallDir "$PROGRAMFILES\scm"

 InstallDirRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" ""

 ShowInstDetails show

@@ -100,10 +100,10 @@ FunctionEnd
 Section "MainSection" SEC01

   SetOutPath "$INSTDIR"

   SetOverwrite try

-  File "SCM.lnk"

   File "scm.exe"

   File "scm.html"

-  File "Init5e4.scm"

+  File "SCM.ico"

+  File "Init5e5.scm"

   File "Transcen.scm"

   File "mkimpcat.scm"

   File "hobbit.scm"

@@ -116,10 +116,10 @@ Section "MainSection" SEC01
 

 ; Shortcuts

   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

-  CreateShortCut "$DESKTOP\SCM.lnk" "$INSTDIR\scm.lnk"

+  CreateShortCut "$DESKTOP\SCM.lnk" "$INSTDIR\scm.exe" "" "$INSTDIR\SCM.ico"

   CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"

   CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\SCM Manual.lnk" "$INSTDIR\scm.html"

-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\SCM.lnk" "$INSTDIR\SCM.lnk"

+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\SCM.lnk" "$INSTDIR\scm.exe" "" "$INSTDIR\SCM.ico"

   CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Hobbit Manual.lnk" "$INSTDIR\hobbit.html"

   !insertmacro MUI_STARTMENU_WRITE_END

 

@@ -181,10 +181,16 @@ Section Uninstall
   Delete "$INSTDIR\hobbit.scm"

   Delete "$INSTDIR\mkimpcat.scm"

   Delete "$INSTDIR\Transcen.scm"

-  Delete "$INSTDIR\Init5e4.scm"

+  Delete "$INSTDIR\Init5e5.scm"

+  Delete "$INSTDIR\SCM.ico"

   Delete "$INSTDIR\scm.html"

   Delete "$INSTDIR\scm.exe"

-  Delete "$INSTDIR\SCM.lnk"

+  Delete "$INSTDIR\scmlit.exe"

+  Delete "$INSTDIR\implcat"

+  Delete "$INSTDIR\slibcat"

+  Delete "$INSTDIR\tmp1"

+  Delete "$INSTDIR\tmp2"

+  Delete "$INSTDIR\tmp3"

 

   Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"

   Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"