[arch-commits] Commit in screen/repos (3 files)

Allan McRae allan at archlinux.org
Fri May 29 09:28:45 EDT 2009


    Date: Friday, May 29, 2009 @ 09:28:45
  Author: allan
Revision: 40377

Merged revisions 40237 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/screen/trunk

........
  r40237 | allan | 2009-05-29 00:52:11 +0000 (Fri, 29 May 2009) | 2 lines
  
  upgpkg: screen 4.0.3-8
      fix install scriptlet error, update url
........

Modified:
  screen/repos/extra-x86_64/	(properties)
  screen/repos/extra-x86_64/PKGBUILD
  screen/repos/extra-x86_64/screen.install

----------------+
 PKGBUILD       |    4 ++--
 screen.install |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)


Property changes on: screen/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /screen/trunk:1-40128
   + /screen/trunk:1-40373

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-29 13:28:32 UTC (rev 40376)
+++ extra-x86_64/PKGBUILD	2009-05-29 13:28:45 UTC (rev 40377)
@@ -4,11 +4,11 @@
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=7
+pkgrel=8
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
 arch=('i686' 'x86_64')
-url="ftp://ftp.uni-erlangen.de/pub/utilities/screen"
+url="http://www.gnu.org/software/screen/"
 license=('GPL')
 depends=('ncurses' 'pam')
 backup=('etc/screenrc' 'etc/pam.d/screen')

Modified: extra-x86_64/screen.install
===================================================================
--- extra-x86_64/screen.install	2009-05-29 13:28:32 UTC (rev 40376)
+++ extra-x86_64/screen.install	2009-05-29 13:28:45 UTC (rev 40377)
@@ -9,14 +9,6 @@
 }
 
 pre_upgrade() {
-    pre_remove $*
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
     compiled="/usr/share/terminfo/s/screen-256color"
     if [ -e $compiled ]; then
         if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
@@ -33,7 +25,15 @@
             echo "done."
         fi
     fi
+}
 
+post_upgrade() {
+    post_install $1
+}
+
+pre_remove() {
+    pre_upgrade $*
+
     [ -x usr/bin/install-info ] || return 0
     for file in ${filelist[@]}; do
         install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null



More information about the arch-commits mailing list