[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-150-gff402b6
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Apr 29 13:37:41 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via ff402b6784ba7be3ec9f98e09defa88a53c5e64b (commit)
via 0e124c16c50a469c4cb7f05939f68967cce99a7a (commit)
via 9c7bd7e11534951fb0a8e365de711b2fad7ad3a1 (commit)
via 4e6b6fa91e47f9ec984867ef37dada015f4999d7 (commit)
via 31fedb0d207d04af6eaaa5c25ad922e8cb18fa5e (commit)
from 26fd510d2aaa5fead2b9a428f3a73d1e650c6fba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ff402b6784ba7be3ec9f98e09defa88a53c5e64b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 29 11:15:22 2013 +0000
Add repackaged dbus-bin and update packaging
This package contains a libexpat.dll from expat 2.0.1
as it was linked against this name.
* src/inst-dbus.nsi, src/uninst-dbus.nsi: Fix etc paths, remove
libexpatw.dll
--
The best solution for the libexpat workaround is to build
dbus together with the rest of gpg4win and not include it as
binary. This should be easy as windows is a supported dbus
platform and has a autotools buildsystem.
diff --git a/packages/packages.current b/packages/packages.current
index 661ad46..a5c2c67 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -443,8 +443,8 @@ chk 66c56babca65fb38c6919cf63405dc51acf00ac6
server http://files.kolab.org/local/gpg4win/libs/
-file dbus-x86-mingw4-1.4.24-20130417-bin.tar.bz2
-chk f556de269dda7bdd2a45639681533ee3da2732d4
+file dbus-x86-mingw4-1.4.24-20130417-1-bin.tar.bz2
+chk 59abdc742ce87011dadbc58e96ed870a927d0045
file dbus-x86-mingw4-1.4.24-20130417-lib.tar.bz2
chk fc557d7eb161881e1d6c091f215dd8e0615682cb
diff --git a/src/inst-dbus.nsi b/src/inst-dbus.nsi
index d8a8383..eddcd2c 100644
--- a/src/inst-dbus.nsi
+++ b/src/inst-dbus.nsi
@@ -64,11 +64,9 @@ Section "-dbus" SEC_dbus
File /oname=libexpat.dll.tmp ${prefix}/bin/libexpat.dll
Rename /REBOOTOK libexpat.dll.tmp libexpat.dll
- File ${prefix}/bin/libexpatw.dll
-
- SetOutPath "$INSTDIR\etc"
- File ${prefix}/etc/session.conf
- File ${prefix}/etc/system.conf
+ SetOutPath "$INSTDIR\etc\dbus-1"
+ File ${prefix}/etc/dbus-1/session.conf
+ File ${prefix}/etc/dbus-1/system.conf
!endif
SectionEnd
diff --git a/src/uninst-dbus.nsi b/src/uninst-dbus.nsi
index a9c8ecb..c085699 100644
--- a/src/uninst-dbus.nsi
+++ b/src/uninst-dbus.nsi
@@ -42,10 +42,10 @@ Section "-un.dbus"
# FIXME: Force dbus installed in our prefix down.
Delete /REBOOTOK "$INSTDIR\libdbus-1.dll"
Delete /REBOOTOK "$INSTDIR\libexpat.dll"
- Delete "$INSTDIR\libexpatw.dll"
- Delete "$INSTDIR\etc\session.conf"
- Delete "$INSTDIR\etc\system.conf"
+ Delete "$INSTDIR\etc\dbus-1\session.conf"
+ Delete "$INSTDIR\etc\dbus-1\system.conf"
+ RMDir "$INSTDIR\etc\dbus-1"
RMDir "$INSTDIR\etc"
RMDir "$INSTDIR"
commit 0e124c16c50a469c4cb7f05939f68967cce99a7a
Merge: 9c7bd7e 26fd510
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 29 11:05:45 2013 +0000
Merge branch 'master'
commit 9c7bd7e11534951fb0a8e365de711b2fad7ad3a1
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 29 10:10:52 2013 +0000
Fix oxygen-icon filenames
This adds a -bin suffix to the binary package and
remvoes the -kde- part so that it is in line with
the other package names.
* packages/packages.current: Update oxygen-icons filenames.
diff --git a/packages/packages.current b/packages/packages.current
index 85f6eee..661ad46 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -459,10 +459,10 @@ chk f03ffd02333f786a5e540c4430d3109952b5553e
server http://files.kolab.org/local/gpg4win
-file oxygen-icons-kde-4.10.2.tar.bz2
+file oxygen-icons-4.10.2-bin.tar.bz2
chk b9a7063b7edade07d8a517b147720e1590bf0a75
-file oxygen-icons-kde-4.10.2-src.tar.bz2
+file oxygen-icons-4.10.2-src.tar.bz2
chk a9384cd6fe240a362f5bbb3bbc0e918af63531dc
commit 4e6b6fa91e47f9ec984867ef37dada015f4999d7
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 29 09:51:37 2013 +0000
Add qt and oxygen-icons dependencies for kleopatra
Previously kdelibs depended on them.
configure.ac: Add dependency to qt and oxygen-icons to kleopatra
diff --git a/configure.ac b/configure.ac
index d5ed74f..24ef0b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,8 +331,7 @@ GPG4WIN_IPKG([compendium])
GPG4WIN_BPKG_GNUWIN32([dbus])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_BPKG_GNUWIN32([qt], [dbus])
-#GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
-GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2])
+GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 qt oxygen-icons])
GPG4WIN_FINALIZE
commit 31fedb0d207d04af6eaaa5c25ad922e8cb18fa5e
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 29 09:46:47 2013 +0000
Only package dbus in inst-dbus.nsi
This removes the old kdesupport packaging artifacts.
* src/inst-dbus.nsi, src/uninist-dbus.nsi: Only package dbus
diff --git a/src/inst-dbus.nsi b/src/inst-dbus.nsi
index 81ed606..d8a8383 100644
--- a/src/inst-dbus.nsi
+++ b/src/inst-dbus.nsi
@@ -47,18 +47,6 @@ Section "-dbus" SEC_dbus
File ${prefix}/bin/dbus-env.bat
File ${prefix}/bin/dbus-monitor.exe
File ${prefix}/bin/dbus-send.exe
- File ${prefix}/bin/pcregrep.exe
- File ${prefix}/bin/update-mime-database.exe
- File ${prefix}/bin/xmlcatalog.exe
- File ${prefix}/bin/xmllint.exe
- File ${prefix}/bin/xsltproc.exe
-
- # FIXME: From the lib package. This is wrong.
-!undef prefix
-!define prefix ${ipdir}/dbus-dev-${gpg4win_pkg_dbus_version}
-
- SetOutPath "$INSTDIR"
- File ${prefix}/bin/giflib4.dll
ClearErrors
SetOverwrite try
@@ -77,14 +65,6 @@ Section "-dbus" SEC_dbus
Rename /REBOOTOK libexpat.dll.tmp libexpat.dll
File ${prefix}/bin/libexpatw.dll
- File ${prefix}/bin/libexslt.dll
- File ${prefix}/bin/libkdewin32.dll
- File ${prefix}/bin/libxml2.dll
- File ${prefix}/bin/libxslt.dll
- File ${prefix}/bin/mingw-pcrecpp.dll
- File ${prefix}/bin/pcre.dll
- File ${prefix}/bin/pcrecpp.dll
- File ${prefix}/bin/pcreposix.dll
SetOutPath "$INSTDIR\etc"
File ${prefix}/etc/session.conf
diff --git a/src/uninst-dbus.nsi b/src/uninst-dbus.nsi
index 1887ed0..a9c8ecb 100644
--- a/src/uninst-dbus.nsi
+++ b/src/uninst-dbus.nsi
@@ -38,31 +38,11 @@ Section "-un.dbus"
Delete "$INSTDIR\dbus-launch.exe"
Delete "$INSTDIR\dbus-monitor.exe"
Delete "$INSTDIR\dbus-send.exe"
- Delete "$INSTDIR\pcregrep.exe"
- Delete "$INSTDIR\update-mime-database.exe"
- Delete "$INSTDIR\xmlcatalog.exe"
- Delete "$INSTDIR\xmllint.exe"
- Delete "$INSTDIR\xsltproc.exe"
- Delete "$INSTDIR\giflib4.dll"
- # We can not force down dbus-daemon, because it may be in use by
- # non-gpg4win components (like KoWi).
+ # FIXME: Force dbus installed in our prefix down.
Delete /REBOOTOK "$INSTDIR\libdbus-1.dll"
Delete /REBOOTOK "$INSTDIR\libexpat.dll"
Delete "$INSTDIR\libexpatw.dll"
- Delete "$INSTDIR\libexslt.dll"
- Delete "$INSTDIR\libkdewin32.dll"
- Delete "$INSTDIR\libxml2.dll"
- Delete "$INSTDIR\libxslt.dll"
- Delete "$INSTDIR\mingw-pcrecpp.dll"
- Delete "$INSTDIR\pcre.dll"
- Delete "$INSTDIR\pcrecpp.dll"
- Delete "$INSTDIR\pcreposix.dll"
-
- # Some test installers installed these files:
- # fixme: Remove them when releasing 2.0.
- Delete "$INSTDIR\ssleay32.dll"
- Delete "$INSTDIR\libeay32.dll"
Delete "$INSTDIR\etc\session.conf"
Delete "$INSTDIR\etc\system.conf"
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 3 +--
packages/packages.current | 8 ++++----
src/inst-dbus.nsi | 28 +++-------------------------
src/uninst-dbus.nsi | 28 ++++------------------------
4 files changed, 12 insertions(+), 55 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list