--- a/patches/gtkam-01-menu-entry.diff Thu Mar 18 16:19:40 2004 +0000
+++ b/patches/gtkam-01-menu-entry.diff Thu Mar 18 17:06:00 2004 +0000
@@ -1,5 +1,5 @@
---- ../gtkam-0.1.10.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./gtkam.desktop.in 2003-08-14 10:27:25.000000000 +0100
+--- ../gtkam-0.1.11.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 +0100
++++ ./gtkam.desktop.in 2004-03-18 16:01:13.000000000 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -11,20 +11,8 @@
+Type=Application
+Categories=Application;AudioVideo;
+StartupNotify=true
---- ../gtkam-0.1.10.old/configure.in 2003-08-14 10:16:36.000000000 +0100
-+++ ./configure.in 2003-08-14 10:55:12.000000000 +0100
-@@ -27,6 +27,9 @@
- AC_ERROR([You need pkg-config for gtkam.])
- fi
-
-+AC_PROG_INTLTOOL
-+AC_PROG_LIBTOOL
-+
- dnl ---------------------------------------------------------------------------
- dnl Libraries we need for gtkam
- dnl ---------------------------------------------------------------------------
---- ../gtkam-0.1.10.old/intltool-extract.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./intltool-extract.in 2003-08-14 10:58:02.000000000 +0100
+--- ../gtkam-0.1.11.old/intltool-extract.in 1970-01-01 01:00:00.000000000 +0100
++++ ./intltool-extract.in 2004-03-18 16:01:36.000000000 +0000
@@ -0,0 +1,389 @@
+#!@INTLTOOL_PERL@ -w
+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -415,8 +403,8 @@
+ }
+}
+
---- ../gtkam-0.1.10.old/intltool-merge.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./intltool-merge.in 2003-08-14 10:58:02.000000000 +0100
+--- ../gtkam-0.1.11.old/intltool-merge.in 1970-01-01 01:00:00.000000000 +0100
++++ ./intltool-merge.in 2004-03-18 16:01:45.000000000 +0000
@@ -0,0 +1,916 @@
+#!@INTLTOOL_PERL@ -w
+
@@ -1334,8 +1322,8 @@
+ return @list;
+}
+
---- ../gtkam-0.1.10.old/intltool-update.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./intltool-update.in 2003-08-14 10:58:02.000000000 +0100
+--- ../gtkam-0.1.11.old/intltool-update.in 1970-01-01 01:00:00.000000000 +0100
++++ ./intltool-update.in 2004-03-18 16:01:54.000000000 +0000
@@ -0,0 +1,642 @@
+#!@INTLTOOL_PERL@ -w
+
@@ -1979,15 +1967,15 @@
+ "Make sure to run this script inside the po directory.\n";
+ exit;
+}
---- ../gtkam-0.1.10.old/Makefile.am 2003-08-14 10:16:36.000000000 +0100
-+++ ./Makefile.am 2003-08-15 15:54:51.000000000 +0100
-@@ -28,4 +28,21 @@
+--- ../gtkam-0.1.11.old/Makefile.am 2004-03-18 16:00:30.000000000 +0000
++++ ./Makefile.am 2004-03-18 16:04:07.000000000 +0000
+@@ -15,8 +15,24 @@
+ INCLUDES = \
+ -DDATADIR=\""$(datadir)"\"
- ACLOCAL_AMFLAGS = -I m4
+-EXTRA_DIST = config.rpath mkinstalldirs gtkam.desktop gtkam.png
++@INTLTOOL_DESKTOP_RULE@
--EXTRA_DIST = config.rpath mkinstalldirs
-+@INTLTOOL_DESKTOP_RULE@
-+
+DESKTOP_IN_FILES=gtkam.desktop.in
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+
@@ -2004,17 +1992,41 @@
+ $(DESKTOP_IN_FILES) \
+ $(DESKTOP_FILES)
+
---- ../gtkam-0.1.10.old/art/Makefile.am 2003-08-14 10:16:36.000000000 +0100
-+++ ./art/Makefile.am 2003-08-15 16:33:43.000000000 +0100
-@@ -7,4 +7,10 @@
+ if ENABLE_RPM
+
+ # create RPM packages
+--- ../gtkam-0.1.11.old/art/Makefile.am 2004-03-18 16:00:30.000000000 +0000
++++ ./art/Makefile.am 2004-03-18 16:04:57.000000000 +0000
+@@ -7,4 +7,9 @@
gtkam-lock.png \
gtkam-new.png
-EXTRA_DIST = $(images_DATA)
+icondir = $(datadir)/pixmaps
+icon_DATA = gtkam-camera.png
++EXTRA_DIST = \
++ $(images_DATA) \
++ $(icon_DATA)
+
-+EXTRA_DIST = \
-+ $(images_DATA) \
-+ $(icon_DATA)
-+
+--- ../gtkam-0.1.11.old/configure.in 2004-03-18 16:42:38.000000000 +0000
++++ ./configure.in 2004-03-18 16:43:24.000000000 +0000
+@@ -27,6 +27,10 @@
+ AC_ERROR([You need pkg-config for gtkam.])
+ fi
+
++AC_PROG_INTLTOOL
++AC_PROG_LIBTOOL
++AC_SUBST(POMAKEFILEDEPS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl Libraries we need for gtkam
+ dnl ---------------------------------------------------------------------------
+@@ -82,7 +86,7 @@
+ dnl omf/scrollkeper/gnome-style docs
+ dnl ---------------------------------------------------------------------------
+
+-GTKAM_C_IDENTIFIER="file:/usr/local/share/gnome/help/gtkam/C/gtkam.xml"
++GTKAM_C_IDENTIFIER="file:/usr/share/gnome/help/gtkam/C/gtkam.xml"
+ AC_SUBST(GTKAM_C_IDENTIFIER)
+
+ dnl ---------------------------------------------------------------------------