author | dcarbery |
Fri, 24 Nov 2006 16:37:59 +0000 | |
branch | 217update |
changeset 19096 | d542fc2c823e |
parent 7317 | b5916cd8b090 |
child 8871 | 55ce37a488bc |
permissions | -rw-r--r-- |
2244 | 1 |
--- ../gtkam-0.1.11.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 +0100 |
5262 | 2 |
+++ ./gtkam.desktop.in 2005-03-22 12:05:37.763024976 +0000 |
1069 | 3 |
@@ -0,0 +1,10 @@ |
4 |
+[Desktop Entry] |
|
5 |
+Encoding=UTF-8 |
|
7317 | 6 |
+_Name=Gtkam Digital Camera Browser |
7 |
+_Comment=Browse and download images from an attached digital camera |
|
1069 | 8 |
+Exec=gtkam |
9 |
+Icon=gtkam-camera.png |
|
10 |
+Terminal=false |
|
11 |
+Type=Application |
|
7317 | 12 |
+Categories=Application;Graphics; |
1069 | 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 | 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 | 21 |
+@INTLTOOL_DESKTOP_RULE@ |
1069 | 22 |
|
23 |
+DESKTOP_IN_FILES=gtkam.desktop.in |
|
24 |
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) |
|
25 |
+ |
|
26 |
+Applicationsdir = $(datadir)/applications |
|
27 |
+Applications_DATA = $(DESKTOP_FILES) |
|
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 | 34 |
+ $(DESKTOP_FILES) |
2244 | 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 | 38 |
--- ../gtkam-0.1.11.old/art/Makefile.am 2005-03-22 12:05:17.845052968 +0000 |
39 |
+++ ./art/Makefile.am 2005-03-22 12:05:37.764024824 +0000 |
|
2244 | 40 |
@@ -7,4 +7,9 @@ |
1069 | 41 |
gtkam-lock.png \ |
42 |
gtkam-new.png |
|
43 |
||
44 |
-EXTRA_DIST = $(images_DATA) |
|
45 |
+icondir = $(datadir)/pixmaps |
|
46 |
+icon_DATA = gtkam-camera.png |
|
2244 | 47 |
+EXTRA_DIST = \ |
48 |
+ $(images_DATA) \ |
|
49 |
+ $(icon_DATA) |
|
1069 | 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 | 57 |
+AC_PROG_INTLTOOL |
58 |
+AC_PROG_LIBTOOL |
|
59 |
+AC_SUBST(POMAKEFILEDEPS) |
|
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]) |