[arch-commits] Commit in unison/repos (9 files)

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:57:23 EST 2012


    Date: Sunday, February 5, 2012 @ 06:57:22
  Author: ibiru
Revision: 148949

db-move: moved unison from [testing] to [extra] (i686)

Added:
  unison/repos/extra-i686/PKGBUILD
    (from rev 148654, unison/repos/testing-i686/PKGBUILD)
  unison/repos/extra-i686/unison-ssh-ocaml.patch
    (from rev 148654, unison/repos/testing-i686/unison-ssh-ocaml.patch)
  unison/repos/extra-i686/unison.desktop
    (from rev 148654, unison/repos/testing-i686/unison.desktop)
  unison/repos/extra-i686/unison.install
    (from rev 148654, unison/repos/testing-i686/unison.install)
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/testing-i686/

------------------------+
 PKGBUILD               |   97 ++++++++++++++++++++++++-----------------------
 unison-ssh-ocaml.patch |   50 ++++++++++++------------
 unison.desktop         |   26 ++++++------
 unison.install         |   56 +++++++++++++--------------
 4 files changed, 117 insertions(+), 112 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-05 11:57:19 UTC (rev 148948)
+++ extra-i686/PKGBUILD	2012-02-05 11:57:22 UTC (rev 148949)
@@ -1,46 +0,0 @@
-# $Id$
-#Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=unison
-pkgver=2.40.63
-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')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
-        $pkgname.desktop)
-options=(!makeflags)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  CFLAGS=""
-  make clean
-  make mkProjectInfo 
-  make UISTYLE=text DEBUGGING=false THREADS=true 
-  mkdir -p $startdir/pkg/usr/bin 
-  install -Dm755 unison $startdir/pkg/usr/bin/unison
- 
- # 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 $startdir/pkg/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
-  make clean
-  make mkProjectInfo
-  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-  install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install the png
-  install -Dm644 ../$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
-  convert win32rc/U.ico unison.png
-  install -Dm644 ${pkgname}-1.png  $startdir/pkg/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
-  cd $startdir/pkg//usr/bin
-  ln -s unison-gtk2 unison-x11
-}
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
-         '2daecba7705455a8e4b769e48b059872')

Copied: unison/repos/extra-i686/PKGBUILD (from rev 148654, unison/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-05 11:57:22 UTC (rev 148949)
@@ -0,0 +1,51 @@
+# $Id$
+#Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=unison
+pkgver=2.40.63
+pkgrel=3
+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/stable/$pkgname-$pkgver.tar.gz
+        $pkgname.desktop)
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
+         '2daecba7705455a8e4b769e48b059872')
+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
+}

Deleted: extra-i686/unison-ssh-ocaml.patch
===================================================================
--- extra-i686/unison-ssh-ocaml.patch	2012-02-05 11:57:19 UTC (rev 148948)
+++ extra-i686/unison-ssh-ocaml.patch	2012-02-05 11:57:22 UTC (rev 148949)
@@ -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

Copied: unison/repos/extra-i686/unison-ssh-ocaml.patch (from rev 148654, unison/repos/testing-i686/unison-ssh-ocaml.patch)
===================================================================
--- extra-i686/unison-ssh-ocaml.patch	                        (rev 0)
+++ extra-i686/unison-ssh-ocaml.patch	2012-02-05 11:57:22 UTC (rev 148949)
@@ -0,0 +1,25 @@
+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	2012-02-05 11:57:19 UTC (rev 148948)
+++ extra-i686/unison.desktop	2012-02-05 11:57:22 UTC (rev 148949)
@@ -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 148654, unison/repos/testing-i686/unison.desktop)
===================================================================
--- extra-i686/unison.desktop	                        (rev 0)
+++ extra-i686/unison.desktop	2012-02-05 11:57:22 UTC (rev 148949)
@@ -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	2012-02-05 11:57:19 UTC (rev 148948)
+++ extra-i686/unison.install	2012-02-05 11:57:22 UTC (rev 148949)
@@ -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
-}

Copied: unison/repos/extra-i686/unison.install (from rev 148654, unison/repos/testing-i686/unison.install)
===================================================================
--- extra-i686/unison.install	                        (rev 0)
+++ extra-i686/unison.install	2012-02-05 11:57:22 UTC (rev 148949)
@@ -0,0 +1,28 @@
+# 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
+}



More information about the arch-commits mailing list