[Gpg4win-commits] r1095 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Feb 6 18:10:00 CET 2009
Author: mmutz
Date: 2009-02-06 18:09:58 +0100 (Fri, 06 Feb 2009)
New Revision: 1095
Modified:
trunk/ChangeLog
trunk/packages/packages.current
trunk/src/inst-kleopatra.nsi
trunk/src/uninst-kleopatra.nsi
Log:
* packages/packages.current: update kdelibs, kleopatra
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: adjust to new
package layout, disable Kleopatra HTML handbook until we can built
it in an automated fashion.
2009-02-06 Marc Mutz <marc at kdab.net>
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-02-06 13:50:19 UTC (rev 1094)
+++ trunk/ChangeLog 2009-02-06 17:09:58 UTC (rev 1095)
@@ -1,5 +1,12 @@
2009-02-06 Marc Mutz <marc at kdab.net>
+ * packages/packages.current: update kdelibs, kleopatra
+ * src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: adjust to new
+ package layout, disable Kleopatra HTML handbook until we can built
+ it in an automated fashion.
+
+2009-02-06 Marc Mutz <marc at kdab.net>
+
* configure.ac: Kleopatra is now a GPG4WIN_BPKG_BINSRC
2009-02-06 Marc Mutz <marc at kdab.net>
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2009-02-06 13:50:19 UTC (rev 1094)
+++ trunk/packages/packages.current 2009-02-06 17:09:58 UTC (rev 1095)
@@ -410,27 +410,27 @@
server ftp://ftp.kdab.net/pub/gpg4win
-file kdelibs-20090205-bin.zip
-chk 45fa7aea9d204a31e75bf4293902666183715185
+file kdelibs-20090206-bin.zip
+chk 0624df8078d4bc8c3571f99bed6d90e2efa55fc2
-file kdelibs-20090205-lib.zip
-chk 65e03c698f3d61871f998abf1d5b8c595c5d6197
+file kdelibs-20090206-lib.zip
+chk 121d72498869e4ebfe23b696134248e079a23e77
-file kdelibs-20090205-src.zip
-chk f42912f2028c7ef13826d235eabce70f960c7b77
+file kdelibs-20090206-src.zip
+chk 33d234f17a7076b538c702d091671e9a81204fa2
# Kleopatra
server ftp://ftp.kdab.net/pub/gpg4win
-file kleopatra-20090205-bin.zip
-chk 4cbe19a5f9d2384a6cdfd6789c2080a0ca290425
+file kleopatra-20090206-bin.zip
+chk b0b7ad5f9e37daecd1e97c5c08bbe257d3010226
# FIXME: These belong in the bin package.
#name kleopatra-20081128-lib.zip
#file kleopatra-20081128-doc.zip
#chk 3dbcc84ce76031274c52e816835ff547423fc660
-file kleopatra-20090205-src.zip
-chk 7f8a7f02460664be2aed68e2059d72f5fa96487d
+file kleopatra-20090206-src.zip
+chk 1560875d3bba5706d4ea4d0e723df0203dce13b3
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2009-02-06 13:50:19 UTC (rev 1094)
+++ trunk/src/inst-kleopatra.nsi 2009-02-06 17:09:58 UTC (rev 1095)
@@ -117,11 +117,6 @@
File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
- # FIXME: From the lib package. This is wrong.
-!undef prefix
-!define prefix ${ipdir}/kleopatra-dev-${gpg4win_pkg_kleopatra_version}
-
-
SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
@@ -222,79 +217,79 @@
File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
-
- SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
+# FIXME these are not packaged yet
+# SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
+#
+# File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/configuration-dn-order.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/favicon.ico
+# File ${prefix}/share/doc/HTML/en/kleopatra/fdl-notice.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/functions-keylist-management.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/header.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/index.cache
+# File ${prefix}/share/doc/HTML/en/kleopatra/index.cache.bz2
+# File ${prefix}/share/doc/HTML/en/kleopatra/index.docbook
+# File ${prefix}/share/doc/HTML/en/kleopatra/index.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/mainfooter.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/mainheader.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/menucrls.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/xml.dcl
+#
+# SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra\common"
+#
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/1.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/10.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/2.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/3.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/4.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/5.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/6.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/7.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/8.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/9.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/artistic-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_bottom.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_mid.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_top.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-left.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-middle.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-right.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/bsd-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/doxygen.css
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/footer.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/kde-default.css
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/kde_logo_bg.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/qpl-license.html
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/tabs.css
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top-kde.jpg
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.jpg
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top-middle.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.jpg
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.png
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/top.jpg
+# File ${prefix}/share/doc/HTML/en/kleopatra/common/x11-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
- File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
- File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
- File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
- File ${prefix}/share/doc/HTML/en/kleopatra/configuration-dn-order.html
- File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
- File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/favicon.ico
- File ${prefix}/share/doc/HTML/en/kleopatra/fdl-notice.html
- File ${prefix}/share/doc/HTML/en/kleopatra/functions-keylist-management.html
- File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
- File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
- File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
- File ${prefix}/share/doc/HTML/en/kleopatra/header.html
- File ${prefix}/share/doc/HTML/en/kleopatra/index.cache
- File ${prefix}/share/doc/HTML/en/kleopatra/index.cache.bz2
- File ${prefix}/share/doc/HTML/en/kleopatra/index.docbook
- File ${prefix}/share/doc/HTML/en/kleopatra/index.html
- File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
- File ${prefix}/share/doc/HTML/en/kleopatra/mainfooter.html
- File ${prefix}/share/doc/HTML/en/kleopatra/mainheader.html
- File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
- File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
- File ${prefix}/share/doc/HTML/en/kleopatra/menucrls.html
- File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
- File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
- File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
- File ${prefix}/share/doc/HTML/en/kleopatra/xml.dcl
-
- SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra\common"
-
- File ${prefix}/share/doc/HTML/en/kleopatra/common/1.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/10.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/2.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/3.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/4.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/5.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/6.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/7.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/8.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/9.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/artistic-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_bottom.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_mid.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_top.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-left.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-middle.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-right.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/bsd-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/doxygen.css
- File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license
- File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/footer.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license
- File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/kde-default.css
- File ${prefix}/share/doc/HTML/en/kleopatra/common/kde_logo_bg.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license
- File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/qpl-license.html
- File ${prefix}/share/doc/HTML/en/kleopatra/common/tabs.css
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top-kde.jpg
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.jpg
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top-middle.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.jpg
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.png
- File ${prefix}/share/doc/HTML/en/kleopatra/common/top.jpg
- File ${prefix}/share/doc/HTML/en/kleopatra/common/x11-license.html
-
!endif
${MementoSectionEnd}
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2009-02-06 13:50:19 UTC (rev 1094)
+++ trunk/src/uninst-kleopatra.nsi 2009-02-06 17:09:58 UTC (rev 1095)
@@ -149,44 +149,44 @@
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\1.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\10.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\2.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\3.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\4.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\5.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\6.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\7.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\8.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\9.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\artistic-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_bottom.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_mid.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_top.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-left.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-middle.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-right.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bsd-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\doxygen.css"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\footer.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde-default.css"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde_logo_bg.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\qpl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\tabs.css"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-kde.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-middle.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.png"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\x11-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\1.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\10.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\2.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\3.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\4.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\5.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\6.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\7.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\8.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\9.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\artistic-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_bottom.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_mid.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_top.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-left.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-middle.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-right.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bsd-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\doxygen.css"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\footer.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde-default.css"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde_logo_bg.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\qpl-license.html"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\tabs.css"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-kde.jpg"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.jpg"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-middle.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.jpg"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.png"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top.jpg"
+# Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\x11-license.html"
RMDir "$INSTDIR\share\doc\HTML\en\kleopatra\common"
More information about the Gpg4win-commits
mailing list