patches/gtkam-01-menu-entry.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 7317 b5916cd8b090
child 8871 55ce37a488bc
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2244
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
     1
--- ../gtkam-0.1.11.old/gtkam.desktop.in	1970-01-01 01:00:00.000000000 +0100
5262
e910995684c1 #6227253, Install correct gtkam-C.omf
mattk
parents: 3169
diff changeset
     2
+++ ./gtkam.desktop.in	2005-03-22 12:05:37.763024976 +0000
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
     3
@@ -0,0 +1,10 @@
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
     4
+[Desktop Entry]
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
     5
+Encoding=UTF-8
7317
b5916cd8b090 2006-05-24 Glynn Foster <[email protected]>
gf115653
parents: 6467
diff changeset
     6
+_Name=Gtkam Digital Camera Browser
b5916cd8b090 2006-05-24 Glynn Foster <[email protected]>
gf115653
parents: 6467
diff changeset
     7
+_Comment=Browse and download images from an attached digital camera
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
     8
+Exec=gtkam
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
     9
+Icon=gtkam-camera.png
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    10
+Terminal=false
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    11
+Type=Application
7317
b5916cd8b090 2006-05-24 Glynn Foster <[email protected]>
gf115653
parents: 6467
diff changeset
    12
+Categories=Application;Graphics;
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    13
+StartupNotify=true
6467
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    14
--- gtkam-0.1.13/Makefile.am.orig	2006-01-03 14:30:43.745457000 +0000
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    15
+++ gtkam-0.1.13/Makefile.am	2006-01-03 14:32:49.091620000 +0000
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    16
@@ -19,8 +19,20 @@
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    17
 icondir = $(datadir)/pixmaps
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    18
 icon_DATA = gtkam.png
5262
e910995684c1 #6227253, Install correct gtkam-C.omf
mattk
parents: 3169
diff changeset
    19
 
6467
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    20
-EXTRA_DIST = gtkam.desktop gtkam.png
2244
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    21
+@INTLTOOL_DESKTOP_RULE@
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    22
 
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    23
+DESKTOP_IN_FILES=gtkam.desktop.in
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    24
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    25
+
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    26
+Applicationsdir = $(datadir)/applications
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    27
+Applications_DATA = $(DESKTOP_FILES)
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    28
+
6467
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    29
+EXTRA_DIST =   \
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    30
+	intltool-extract.in     \
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    31
+	intltool-merge.in       \
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    32
+	intltool-update.in      \
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    33
+	$(DESKTOP_IN_FILES)     \
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    34
+	$(DESKTOP_FILES)
2244
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    35
 
6467
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    36
 ########################################################################
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    37
 # Packaging convenience
5262
e910995684c1 #6227253, Install correct gtkam-C.omf
mattk
parents: 3169
diff changeset
    38
--- ../gtkam-0.1.11.old/art/Makefile.am	2005-03-22 12:05:17.845052968 +0000
e910995684c1 #6227253, Install correct gtkam-C.omf
mattk
parents: 3169
diff changeset
    39
+++ ./art/Makefile.am	2005-03-22 12:05:37.764024824 +0000
2244
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    40
@@ -7,4 +7,9 @@
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    41
 	gtkam-lock.png		\
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    42
 	gtkam-new.png
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    43
 
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    44
-EXTRA_DIST = $(images_DATA)
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    45
+icondir = $(datadir)/pixmaps
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    46
+icon_DATA = gtkam-camera.png
2244
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    47
+EXTRA_DIST =			\
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    48
+	$(images_DATA)		\
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    49
+	$(icon_DATA) 
1069
9eab1f2cbac1 Menu Entry Patch
mattk
parents:
diff changeset
    50
+
6467
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    51
--- gtkam-0.1.13/configure.in.orig	2006-01-03 14:24:21.108558000 +0000
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    52
+++ gtkam-0.1.13/configure.in	2006-01-03 14:28:19.556829000 +0000
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    53
@@ -37,6 +37,9 @@
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    54
 AM_PROG_LIBTOOL
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    55
 AC_PROG_INSTALL
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    56
 GP_PKG_CONFIG
2244
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    57
+AC_PROG_INTLTOOL
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    58
+AC_PROG_LIBTOOL
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    59
+AC_SUBST(POMAKEFILEDEPS)
6ab9fc9b4a49 Bump to 0.1.11
mattk
parents: 1411
diff changeset
    60
 
6467
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    61
 GP_CONFIG_MSG([Compiler],[${CC}])
404f78d6029b * patches/gphoto2-01-build.diff, patches/libgphoto2-01-gettext.diff: Rework for new tarball.
dc144907
parents: 5262
diff changeset
    62
 AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",[The C compiler we're using])