Date: Tuesday, February 3, 2015 @ 21:11:51
Author: bisson
Revision: 230406
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
unison/repos/extra-i686/PKGBUILD
(from rev 230405, unison/trunk/PKGBUILD)
unison/repos/extra-i686/unison.desktop
(from rev 230405, unison/trunk/unison.desktop)
unison/repos/extra-x86_64/PKGBUILD
(from rev 230405, unison/trunk/PKGBUILD)
unison/repos/extra-x86_64/unison.desktop
(from rev 230405, unison/trunk/unison.desktop)
Deleted:
unison/repos/extra-i686/PKGBUILD
unison/repos/extra-i686/unison-ssh-ocaml.patch
unison/repos/extra-i686/unison.desktop
unison/repos/extra-i686/unison.install
unison/repos/extra-x86_64/PKGBUILD
unison/repos/extra-x86_64/unison-ssh-ocaml.patch
unison/repos/extra-x86_64/unison.desktop
unison/repos/extra-x86_64/unison.install
-------------------------------------+
/PKGBUILD | 108 ++++++++++++++++++++++++++++++++++
/unison.desktop | 26 ++++++++
extra-i686/PKGBUILD | 54 -----------------
extra-i686/unison-ssh-ocaml.patch | 25 -------
extra-i686/unison.desktop | 13 ----
extra-i686/unison.install | 28 --------
extra-x86_64/PKGBUILD | 54 -----------------
extra-x86_64/unison-ssh-ocaml.patch | 25 -------
extra-x86_64/unison.desktop | 13 ----
extra-x86_64/unison.install | 28 --------
10 files changed, 134 insertions(+), 240 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-i686/PKGBUILD 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,54 +0,0 @@
-# $Id$
-#Maintainer: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=unison
-pkgver=2.40.102
-pkgrel=2
-pkgdesc="Unison is a file-synchronization tool"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.cis.upenn.edu/~bcpierce/unison";
-depends=('glibc')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-optdepends=('gtk2: for gtk2 support')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
- $pkgname.desktop)
-
-options=(!makeflags)
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- CFLAGS=""
- make clean
- make mkProjectInfo
- make UISTYLE=text DEBUGGING=false THREADS=true
- mv unison unison-text
-
- # clean the builddir and rebuild with gtk support
- # broken at the moment!
- # make clean
- # make mkProjectInfo
- # make UISTYLE=gtk DEBUGGING=false THREADS=true
- # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
- make clean
- make mkProjectInfo
- make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -Dm755 unison-text "$pkgdir"/usr/bin/unison
- install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install
the png
- install -Dm644 ../$pkgname.desktop
"$pkgdir"/usr/share/applications/$pkgname.desktop
- convert win32rc/U.ico unison.png
- install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
- cd "$pkgdir"/usr/bin
- ln -s unison-gtk2 unison-x11
- # make versioned symlink #29827
- ln -s unison unison-2.40
-}
-md5sums=('42caf869f40440ed0e75eef07a605b2e'
- '2daecba7705455a8e4b769e48b059872')
Copied: unison/repos/extra-i686/PKGBUILD (from rev 230405,
unison/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-03 20:11:51 UTC (rev 230406)
@@ -0,0 +1,54 @@
+# $Id$
+#Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=unison
+pkgver=2.48.3
+pkgrel=1
+pkgdesc="Unison is a file-synchronization tool"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://www.cis.upenn.edu/~bcpierce/unison";
+depends=('glibc')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+ $pkgname.desktop)
+sha1sums=('74f1c087ee49dc1db4680ad779280f7333d5c968'
+ 'a5181e97d954925c8b14be8f73cd473ca5bd21ba')
+
+options=(!makeflags)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ CFLAGS=""
+ make clean
+ make mkProjectInfo
+ make UISTYLE=text DEBUGGING=false THREADS=true
+ mv unison unison-text
+
+ # clean the builddir and rebuild with gtk support
+ # broken at the moment!
+ # make clean
+ # make mkProjectInfo
+ # make UISTYLE=gtk DEBUGGING=false THREADS=true
+ # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
+ # clean the builddir and rebuild with gtk2 support
+ make clean
+ make mkProjectInfo
+ make UISTYLE=gtk2 DEBUGGING=false THREADS=true
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ install -Dm755 unison-text "$pkgdir"/usr/bin/unison
+ install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
+ # install a .desktop file; create a compliant icon from ico file and install
the png
+ install -Dm644 ../$pkgname.desktop
"$pkgdir"/usr/share/applications/$pkgname.desktop
+ convert win32rc/U.ico unison.png
+ install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
+ # make symlink for .desktop file
+ cd "$pkgdir"/usr/bin
+ ln -s unison-gtk2 unison-x11
+ # make versioned symlink #29827
+ ln -s unison unison-2.40
+}
Deleted: extra-i686/unison-ssh-ocaml.patch
===================================================================
--- extra-i686/unison-ssh-ocaml.patch 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-i686/unison-ssh-ocaml.patch 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,25 +0,0 @@
-Index: src/terminal.ml
-===================================================================
---- src/terminal.ml (révision 463)
-+++ src/terminal.ml (copie de travail)
-@@ -191,7 +191,6 @@
- exit 127
- end
- | childPid ->
-- Unix.close slaveFd;
- (Some masterFd, childPid)
- end
-
-Index: src/update.mli
-===================================================================
---- src/update.mli (révision 463)
-+++ src/update.mli (copie de travail)
-@@ -1,7 +1,7 @@
- (* Unison file synchronizer: src/update.mli *)
- (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
-
--module NameMap : Map.S with type key = Name.t
-+module NameMap : MyMap.S with type key = Name.t
-
- type archive =
- ArchiveDir of Props.t * archive NameMap.t
Deleted: extra-i686/unison.desktop
===================================================================
--- extra-i686/unison.desktop 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-i686/unison.desktop 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
Copied: unison/repos/extra-i686/unison.desktop (from rev 230405,
unison/trunk/unison.desktop)
===================================================================
--- extra-i686/unison.desktop (rev 0)
+++ extra-i686/unison.desktop 2015-02-03 20:11:51 UTC (rev 230406)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Name[de]=unison
+Comment=File synchronisation tool for X11
+Comment[de]=Datei Abgleicher und Synchronisierer
+TryExec=unison-x11
+Exec=unison-x11
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true
Deleted: extra-i686/unison.install
===================================================================
--- extra-i686/unison.install 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-i686/unison.install 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,28 +0,0 @@
-# arg 1: the new package version
-post_install() {
- echo "NOTE:"
- echo " For gtk1 frontend please add 'gtk' package."
- echo " For gtk2 frontend please add 'gtk2' package."
- echo " Default X11 frontend is set to gtk2. "
- echo ""
- echo " If you want to default to gtk1 unison:"
- echo " 'rm /usr/bin/unison-x11'"
- echo " 'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'"
- echo ""
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-x86_64/PKGBUILD 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,54 +0,0 @@
-# $Id$
-#Maintainer: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=unison
-pkgver=2.40.102
-pkgrel=2
-pkgdesc="Unison is a file-synchronization tool"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.cis.upenn.edu/~bcpierce/unison";
-depends=('glibc')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-optdepends=('gtk2: for gtk2 support')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
- $pkgname.desktop)
-
-options=(!makeflags)
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- CFLAGS=""
- make clean
- make mkProjectInfo
- make UISTYLE=text DEBUGGING=false THREADS=true
- mv unison unison-text
-
- # clean the builddir and rebuild with gtk support
- # broken at the moment!
- # make clean
- # make mkProjectInfo
- # make UISTYLE=gtk DEBUGGING=false THREADS=true
- # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
- make clean
- make mkProjectInfo
- make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -Dm755 unison-text "$pkgdir"/usr/bin/unison
- install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install
the png
- install -Dm644 ../$pkgname.desktop
"$pkgdir"/usr/share/applications/$pkgname.desktop
- convert win32rc/U.ico unison.png
- install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
- cd "$pkgdir"/usr/bin
- ln -s unison-gtk2 unison-x11
- # make versioned symlink #29827
- ln -s unison unison-2.40
-}
-md5sums=('42caf869f40440ed0e75eef07a605b2e'
- '2daecba7705455a8e4b769e48b059872')
Copied: unison/repos/extra-x86_64/PKGBUILD (from rev 230405,
unison/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-03 20:11:51 UTC (rev 230406)
@@ -0,0 +1,54 @@
+# $Id$
+#Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=unison
+pkgver=2.48.3
+pkgrel=1
+pkgdesc="Unison is a file-synchronization tool"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://www.cis.upenn.edu/~bcpierce/unison";
+depends=('glibc')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+ $pkgname.desktop)
+sha1sums=('74f1c087ee49dc1db4680ad779280f7333d5c968'
+ 'a5181e97d954925c8b14be8f73cd473ca5bd21ba')
+
+options=(!makeflags)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ CFLAGS=""
+ make clean
+ make mkProjectInfo
+ make UISTYLE=text DEBUGGING=false THREADS=true
+ mv unison unison-text
+
+ # clean the builddir and rebuild with gtk support
+ # broken at the moment!
+ # make clean
+ # make mkProjectInfo
+ # make UISTYLE=gtk DEBUGGING=false THREADS=true
+ # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
+ # clean the builddir and rebuild with gtk2 support
+ make clean
+ make mkProjectInfo
+ make UISTYLE=gtk2 DEBUGGING=false THREADS=true
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ install -Dm755 unison-text "$pkgdir"/usr/bin/unison
+ install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
+ # install a .desktop file; create a compliant icon from ico file and install
the png
+ install -Dm644 ../$pkgname.desktop
"$pkgdir"/usr/share/applications/$pkgname.desktop
+ convert win32rc/U.ico unison.png
+ install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
+ # make symlink for .desktop file
+ cd "$pkgdir"/usr/bin
+ ln -s unison-gtk2 unison-x11
+ # make versioned symlink #29827
+ ln -s unison unison-2.40
+}
Deleted: extra-x86_64/unison-ssh-ocaml.patch
===================================================================
--- extra-x86_64/unison-ssh-ocaml.patch 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-x86_64/unison-ssh-ocaml.patch 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,25 +0,0 @@
-Index: src/terminal.ml
-===================================================================
---- src/terminal.ml (révision 463)
-+++ src/terminal.ml (copie de travail)
-@@ -191,7 +191,6 @@
- exit 127
- end
- | childPid ->
-- Unix.close slaveFd;
- (Some masterFd, childPid)
- end
-
-Index: src/update.mli
-===================================================================
---- src/update.mli (révision 463)
-+++ src/update.mli (copie de travail)
-@@ -1,7 +1,7 @@
- (* Unison file synchronizer: src/update.mli *)
- (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
-
--module NameMap : Map.S with type key = Name.t
-+module NameMap : MyMap.S with type key = Name.t
-
- type archive =
- ArchiveDir of Props.t * archive NameMap.t
Deleted: extra-x86_64/unison.desktop
===================================================================
--- extra-x86_64/unison.desktop 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-x86_64/unison.desktop 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
Copied: unison/repos/extra-x86_64/unison.desktop (from rev 230405,
unison/trunk/unison.desktop)
===================================================================
--- extra-x86_64/unison.desktop (rev 0)
+++ extra-x86_64/unison.desktop 2015-02-03 20:11:51 UTC (rev 230406)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Name[de]=unison
+Comment=File synchronisation tool for X11
+Comment[de]=Datei Abgleicher und Synchronisierer
+TryExec=unison-x11
+Exec=unison-x11
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true
Deleted: extra-x86_64/unison.install
===================================================================
--- extra-x86_64/unison.install 2015-02-03 20:11:18 UTC (rev 230405)
+++ extra-x86_64/unison.install 2015-02-03 20:11:51 UTC (rev 230406)
@@ -1,28 +0,0 @@
-# arg 1: the new package version
-post_install() {
- echo "NOTE:"
- echo " For gtk1 frontend please add 'gtk' package."
- echo " For gtk2 frontend please add 'gtk2' package."
- echo " Default X11 frontend is set to gtk2. "
- echo ""
- echo " If you want to default to gtk1 unison:"
- echo " 'rm /usr/bin/unison-x11'"
- echo " 'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'"
- echo ""
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-}
