[arch-commits] Commit in gtkam/repos (6 files)

Wed Jul 16 23:03:41 UTC 2008

Date: Wednesday, July 16, 2008 @ 19:03:41
  Author: eduardo
Revision: 5503

Merged revisions 2-5502 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/gtkam/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4529 | ronald | 2008-07-07 18:13:47 -0400 (Mon, 07 Jul 2008) | 1 line
  
  fix license
........
  r5348 | eduardo | 2008-07-15 10:51:34 -0400 (Tue, 15 Jul 2008) | 1 line
  
  upgraded sbackup, the app itself shows as old version in about
........
  r5487 | eduardo | 2008-07-16 15:05:38 -0400 (Wed, 16 Jul 2008) | 2 lines
  
  upgpkg: gtkam 0.1.15-1
      now uses libexif-gtk, has no GNOME dependencies
........
  r5488 | eduardo | 2008-07-16 15:13:57 -0400 (Wed, 16 Jul 2008) | 1 line
  
  added x86_64 to PKGBUILD
........
  r5491 | eduardo | 2008-07-16 17:47:34 -0400 (Wed, 16 Jul 2008) | 2 lines
  
  upgpkg: gtkam 0.1.15-2
      small fixes to the PKGBUILD, does it build for x86_64?
........
  r5495 | eduardo | 2008-07-16 17:58:18 -0400 (Wed, 16 Jul 2008) | 1 line
........
  r5496 | eduardo | 2008-07-16 18:02:49 -0400 (Wed, 16 Jul 2008) | 1 line
........
  r5497 | eduardo | 2008-07-16 18:07:15 -0400 (Wed, 16 Jul 2008) | 1 line
  
  fixing PKGBUILD
........
  r5498 | eduardo | 2008-07-16 18:09:01 -0400 (Wed, 16 Jul 2008) | 1 line
........
  r5499 | eduardo | 2008-07-16 18:10:24 -0400 (Wed, 16 Jul 2008) | 1 line
........
  r5500 | eduardo | 2008-07-16 18:12:04 -0400 (Wed, 16 Jul 2008) | 1 line
........
  r5501 | eduardo | 2008-07-16 18:14:03 -0400 (Wed, 16 Jul 2008) | 1 line
........
  r5502 | eduardo | 2008-07-16 18:42:38 -0400 (Wed, 16 Jul 2008) | 1 line
........

Added:
  gtkam/repos/extra-i686/PKGBUILD
    (from rev 5502, gtkam/trunk/PKGBUILD)
  gtkam/repos/extra-i686/gtkam.install
    (from rev 5502, gtkam/trunk/gtkam.install)
Modified:
  gtkam/repos/extra-i686/	(properties)
Deleted:
  gtkam/repos/extra-i686/PKGBUILD
  gtkam/repos/extra-i686/gtkam.install
  gtkam/repos/extra-i686/gtkam.patch

---------------+
 PKGBUILD      |   43 ++++++++++++++++++--------------------
 gtkam.install |   54 ++++++++++++++++++++++++------------------------
 gtkam.patch   |   63 --------------------------------------------------------
 3 files changed, 48 insertions(+), 112 deletions(-)


Property changes on: gtkam/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gtkam/trunk:1
   + /gtkam/trunk:1-5502

Deleted: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2008-07-16 22:42:38 UTC (rev 5502)
+++ extra-i686/PKGBUILD	2008-07-16 23:03:41 UTC (rev 5503)
@@ -1,22 +0,0 @@
-# $Id$
-# Maintainer: Jason Chu <jason at archlinux.org>
-
-pkgname=gtkam
-pkgver=0.1.12
-pkgrel=1
-pkgdesc="A graphical front-end to gPhoto for GNOME"
-url="http://gphoto.sourceforge.net/proj/gtkam/"
-depends=('libgphoto2' 'libbonoboui' 'libgnomeui')
-makedepends=('gimp')
-conflicts=()
-backup=()
-install=gtkam.install
-source=(http://dl.sourceforge.net/sourceforge/gphoto/$pkgname-$pkgver.tar.gz gtkam.patch)
-md5sums=('622170d414718a5ae11487a6af1e47cd' '7be5e54d7cd79418a33826574e98eba9')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../gtkam.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make DESTDIR=$startdir/pkg install
-}

Copied: gtkam/repos/extra-i686/PKGBUILD (from rev 5502, gtkam/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2008-07-16 23:03:41 UTC (rev 5503)
@@ -0,0 +1,21 @@
+# Maintainer: Eduardo Romero <eduardo at archlinux.org>
+
+pkgname=gtkam
+pkgver=0.1.15
+pkgrel=1
+pkgdesc="A graphical front-end to gPhoto for GNOME"
+url="http://gphoto.sourceforge.net/proj/gtkam/"
+arch=(i686)
+depends=('libgphoto2' 'libexif-gtk')
+makedepends=('gimp')
+license=('GPL')
+install=gtkam.install
+source=(http://downloads.sourceforge.net/sourceforge/gphoto/$pkgname-$pkgver.tar.gz)
+md5sums=('6278447dd2f6352809d5378bb88555fc')
+
+build() {
+  cd $startdir/src/$pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --without-bonobo --without-gnome
+  make || return 1
+  make DESTDIR=$startdir/pkg install || return 1
+}

Deleted: extra-i686/gtkam.install
===================================================================
--- extra-i686/gtkam.install	2008-07-16 22:42:38 UTC (rev 5502)
+++ extra-i686/gtkam.install	2008-07-16 23:03:41 UTC (rev 5503)
@@ -1,27 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  scrollkeeper-update -p var/lib/scrollkeeper
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  scrollkeeper-update -p var/lib/scrollkeeper
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  scrollkeeper-update -p var/lib/scrollkeeper
-  /bin/true
-}
-
-op=$1
-shift
-$op $*

Copied: gtkam/repos/extra-i686/gtkam.install (from rev 5502, gtkam/trunk/gtkam.install)
===================================================================
--- extra-i686/gtkam.install	                        (rev 0)
+++ extra-i686/gtkam.install	2008-07-16 23:03:41 UTC (rev 5503)
@@ -0,0 +1,27 @@
+# arg 1:  the new package version
+post_install() {
+  scrollkeeper-update -p var/lib/scrollkeeper
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  scrollkeeper-update -p var/lib/scrollkeeper
+  /bin/true
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  scrollkeeper-update -p var/lib/scrollkeeper
+  /bin/true
+}
+
+op=$1
+shift
+$op $*

Deleted: extra-i686/gtkam.patch
===================================================================
--- extra-i686/gtkam.patch	2008-07-16 22:42:38 UTC (rev 5502)
+++ extra-i686/gtkam.patch	2008-07-16 23:03:41 UTC (rev 5503)
@@ -1,63 +0,0 @@
-diff -ur gtkam-0.1.12/help/C/gtkam.xml gtkam-0.1.12-new/help/C/gtkam.xml
---- gtkam-0.1.12/help/C/gtkam.xml	2004-04-27 03:38:53.000000000 -0700
-+++ gtkam-0.1.12-new/help/C/gtkam.xml	2004-07-14 23:19:19.000000000 -0700
-@@ -183,7 +183,7 @@
-     		then press <keycap>Return</keycap>:</para>
-     		<para> 
- 			<command>gtkam</command> 
--			<!--FIXME comand line --switches -->
-+			<!--FIXME comand line switches -->
-     		</para> 
-     		</listitem>
-     	</varlistentry>
-@@ -203,7 +203,7 @@
- 		fileref="figures/gtkam_start_window.png" format="PNG"/> 
- 	    </imageobject>
- 	    <textobject> 
--	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.
-+	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.</phrase>
- 	    </textobject> 
- 	  </mediaobject> 
- 	</screenshot> 
-diff -ur gtkam-0.1.12/omf-install/Makefile.am gtkam-0.1.12-new/omf-install/Makefile.am
---- gtkam-0.1.12/omf-install/Makefile.am	2004-01-21 02:55:11.000000000 -0800
-+++ gtkam-0.1.12-new/omf-install/Makefile.am	2004-07-14 23:19:41.000000000 -0700
-@@ -24,7 +24,7 @@
- 	-for file in $(srcdir)/*.omf; do \
- 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
-+	-/bin/true -p $(scrollkeeper_localstate_dir) 
- 
- uninstall-local:
- 	-for file in $(srcdir)/*.omf; do \
-@@ -32,7 +32,7 @@
- 		rm -f $(omf_dest_dir)/$$basefile; \
- 	done
- 	-rmdir $(omf_dest_dir)
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+	-/bin/true -p $(scrollkeeper_localstate_dir)
- 
- clean-local:
- 	-for file in $(omffile); do \
-diff -ur gtkam-0.1.12/omf-install/Makefile.in gtkam-0.1.12-new/omf-install/Makefile.in
---- gtkam-0.1.12/omf-install/Makefile.in	2004-05-21 18:28:56.000000000 -0700
-+++ gtkam-0.1.12-new/omf-install/Makefile.in	2004-07-14 23:19:58.000000000 -0700
-@@ -232,7 +232,7 @@
- 	-for file in $(srcdir)/*.omf; do \
- 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
-+	-/bin/true -p $(scrollkeeper_localstate_dir) 
- 
- uninstall-local:
- 	-for file in $(srcdir)/*.omf; do \
-@@ -240,7 +240,7 @@
- 		rm -f $(omf_dest_dir)/$$basefile; \
- 	done
- 	-rmdir $(omf_dest_dir)
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+	-/bin/true -p $(scrollkeeper_localstate_dir)
- 
- clean-local:
- 	-for file in $(omffile); do \



