From c39100a575839c8a1ec86ab901ab802add1e3c32 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 2 May 2012 07:50:36 +0200 Subject: [PATCH] rename and bump --- CLIENT_DATA/setup32.ins | 2 +- CLIENT_DATA/uninstall32.ins | 2 +- OPSI/changelog.txt | 104 +----------------- OPSI/control | 4 +- ...ha1sum => SkypeSetup-5.9.0.114.msi.sha1sum | 2 +- builder-product.cfg | 4 +- 6 files changed, 8 insertions(+), 110 deletions(-) rename SkypeSetup-5.8.32.156.msi.sha1sum => SkypeSetup-5.9.0.114.msi.sha1sum (50%) diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 6f7c532..210ff17 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -31,7 +31,7 @@ Set $LogDir$ = "%SystemDrive%\tmp" ;$ProductId$ should be the name of the product in opsi ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator -Set $ProductId$ = "skype" +Set $ProductId$ = "microsoft.skype" Set $MinimumSpace$ = "30 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\Skype" diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index c09c975..c1eecde 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -27,7 +27,7 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "skype" +Set $ProductId$ = "microsoft.skype" Set $InstallDir$ = "%ProgramFiles32Dir%\Skype" ; ---------------------------------------------------------------- diff --git a/OPSI/changelog.txt b/OPSI/changelog.txt index 0e0367f..9b2dfb4 100644 --- a/OPSI/changelog.txt +++ b/OPSI/changelog.txt @@ -1,103 +1 @@ -opsi-template (4.0-1) stable; urgency=low - - * requires opsi.winst 4.10.8 - * default: 32Bit Version - * additional: 64Bit Version - * additional: 32/64Bit Version - - -- detlef oertel Wed, 18 Jan 2011 16:01:53 +0200 - - -opsi-template (1.0-20) stable; urgency=low - - * removed EnvVar("temp") - * all variable definitions at top - * new loglevel - * removed $NewExe$ - * more infos for inno setup - * removed number at showBitmap - * Initial section removed - * example for $installDir$ changed - - -- detlef oertel Wed, 14 Apr 2010 16:01:53 +0200 - - -opsi-template (1.0-19) stable; urgency=low - - * adding 'Installshield + MSI' to the Winbatch_install section - * changing to 'if $LicenseRequired$ = "true"' from 'if not ($LicenseRequired$ = "false")' - * changed from .ins to 'setup.ins' - - -- detlef oertel Tue, 26 Jan 2010 16:01:53 +0200 - - -opsi-template (1.0-18) stable; urgency=low - * bug fix in the successful request (comment out) - -opsi-template (1.0-17) stable; urgency=low - - * bug fix in delsub.ins : deleting a shortcut from AllUsers desktop - - -- detlef oertel Mon, 28 Sep 2009 16:01:53 +0200 - -opsi-template (1.0-16) stable; urgency=low - - * Added some examples for other installers - * Some cleanups - * More examples in other sections - - -- Jan Schneider Fri, 18 Sep 2009 13:01:53 +0200 - -opsi-template (1.0-15) stable; urgency=low - - * bugfix for delopsi-template - - -- Rupert Roeder Mon, 06 Jun 2009 11:15:00 +0100 - -opsi-template (1.0-14) stable; urgency=low - - * bugfix for delopsi-template - - -- Rupert Roeder Tue, 26 May 2009 11:15:00 +0100 - -opsi-template (1.0-13) stable; urgency=low - - * some corrections - - -- Rupert Roeder Tue, 26 May 2009 11:15:00 +0100 - -opsi-template (1.0-12) stable; urgency=low - - * code for license management added - - -- Rupert Roeder Tue, 19 May 2009 11:15:00 +0100 - -opsi-template (1.0-11) stable; urgency=low - - * sub_check_exitcode modified - * sub_check_exitcode 1641 added - * sub_check_exitcode integrated in delsub.ins - - -- Detlef Oertel Mon, 18 May 2009 14:15:00 +0100 - -opsi-template (1.0-10) stable; urgency=low - - * modified test on exit code added 3010 success restart required - -- bardo wolf - -opsi-template (1.0-9) stable; urgency=low - - * renamed from softprod to opsi-template - * added test on exit code - - -- Detlef Oertel Fri, 13 Mar 2009 12:35:32 +0100 - -opsi-template (1.0-8) stable; urgency=low - - * comment Anweisungen - * delsub: - [Files_uninstall] - ;something like (don't forget the trailing backslash) - ;delete -sf "$InstallDir$\" - - -- Detlef Oertel Wed, 5 Nov 2008 17:00:00 +0100 +empty. \ No newline at end of file diff --git a/OPSI/control b/OPSI/control index 7384bb7..b67e4c6 100644 --- a/OPSI/control +++ b/OPSI/control @@ -5,7 +5,7 @@ incremental: False [Product] type: localboot -id: skype +id: microsoft.skype name: Skype description: Skype ist eine kostenlose VoIP-Software mit Instant-Messaging-Funktion, Dateiuebertragung und Videotelefonie, die ein proprietaeres Protokoll verwendet. advice: ADVICE @@ -32,7 +32,7 @@ default: ["system specific"] [ProductDependency] action: setup -requiredProduct: firefox +requiredProduct: mozilla.firefox requiredStatus: installed requirementType: before diff --git a/SkypeSetup-5.8.32.156.msi.sha1sum b/SkypeSetup-5.9.0.114.msi.sha1sum similarity index 50% rename from SkypeSetup-5.8.32.156.msi.sha1sum rename to SkypeSetup-5.9.0.114.msi.sha1sum index 16b2446..14062a9 100644 --- a/SkypeSetup-5.8.32.156.msi.sha1sum +++ b/SkypeSetup-5.9.0.114.msi.sha1sum @@ -1 +1 @@ -e41c5fb8228ed6b730f26ddaf8669f89e44b86cf /home/mario/.opsi-dist-cache/skype-5.8.32.156/X86/SkypeSetup-5.8.32.156.msi +e41c5fb8228ed6b730f26ddaf8669f89e44b86cf /home/mario/.opsi-dist-cache/microsoft.skype-5.9.0.114/X86/SkypeSetup-5.9.0.114.msi diff --git a/builder-product.cfg b/builder-product.cfg index f2aa49e..64986d9 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -2,8 +2,8 @@ # Setup product information ############################ VENDOR="microsoft.com" -PN="skype" -VERSION="5.8.32.156" +PN="microsoft.skype" +VERSION="5.9.0.114" RELEASE="1" PRIORITY="0" ADVICE=""