Changeset 69

Timestamp:

10/16/07 16:48:38 (5 years ago)

Author:

uncle_fungus

Message:

Ported r67 from trunk

Files:

• branches/2.3.1pre/configure (modified) (2 diffs)
• branches/2.3.1pre/configure.ac (modified) (1 diff)
• branches/2.3.1pre/src/images/icons/128/Makefile.in (modified) (4 diffs)
• branches/2.3.1pre/src/images/icons/256/Makefile.in (modified) (4 diffs)
• branches/2.3.1pre/src/images/icons/64/Makefile.in (modified) (4 diffs)
• branches/mactest/configure (modified) (3 diffs)
• branches/mactest/configure.ac (modified) (1 diff)
• branches/mactest/src/images/icons/128/Makefile.in (modified) (4 diffs)
• branches/mactest/src/images/icons/256/Makefile.in (modified) (4 diffs)
• branches/mactest/src/images/icons/64/Makefile.in (modified) (4 diffs)

branches/2.3.1pre/configure

@@ -6167 +6167 @@
-
-
-
+ src/images/icons/64/Makefile src/images/icons/128/Makefile src/images/icons/256/Makefile
-
-
@@ -6777 +6777 @@
-    "src/images/icons/32/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/32/Makefile" ;;
-    "src/images/icons/48/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/48/Makefile" ;;
+    "src/images/icons/64/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/64/Makefile" ;;
+    "src/images/icons/128/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/128/Makefile" ;;
+    "src/images/icons/256/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/256/Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

branches/2.3.1pre/configure.ac

@@ -65 +65 @@
-   src/images/icons/32/Makefile
-   src/images/icons/48/Makefile
+   src/images/icons/64/Makefile
+   src/images/icons/128/Makefile
+   src/images/icons/256/Makefile
-])
-

branches/2.3.1pre/src/images/icons/128/Makefile.in

@@ -16 +16 @@
-
-# Copyright (C) 2007 Andrew Schofield <the.uncle.fungus@gmail.com>
-  
+
-# This file is free software; as a special exception the author gives
- 
+
-# modifications, as long as this notice is preserved.
- 
+
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -47 +47 @@
-build_triplet = @build@
-host_triplet = @host@
-4
+12
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -189 +189 @@
-target_alias = @target_alias@
-EXTRA_DIST = fahmon.png
-48x4
+128x12
-fahmoniconspix_DATA = $(EXTRA_DIST)
-all: all-am
@@ -203 +203 @@
-          esac; \
-        done; \
-4
+12
-        cd $(top_srcdir) && \
-4
+12
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

branches/2.3.1pre/src/images/icons/256/Makefile.in

@@ -16 +16 @@
-
-# Copyright (C) 2007 Andrew Schofield <the.uncle.fungus@gmail.com>
-  
+
-# This file is free software; as a special exception the author gives
- 
+
-# modifications, as long as this notice is preserved.
- 
+
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -47 +47 @@
-build_triplet = @build@
-host_triplet = @host@
-48
+256
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -189 +189 @@
-target_alias = @target_alias@
-EXTRA_DIST = fahmon.png
-48x48
+256x256
-fahmoniconspix_DATA = $(EXTRA_DIST)
-all: all-am
@@ -203 +203 @@
-          esac; \
-        done; \
-48
+256
-        cd $(top_srcdir) && \
-48
+256
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

branches/2.3.1pre/src/images/icons/64/Makefile.in

@@ -16 +16 @@
-
-# Copyright (C) 2007 Andrew Schofield <the.uncle.fungus@gmail.com>
-  
+
-# This file is free software; as a special exception the author gives
- 
+
-# modifications, as long as this notice is preserved.
- 
+
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -47 +47 @@
-build_triplet = @build@
-host_triplet = @host@
-48
+64
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -189 +189 @@
-target_alias = @target_alias@
-EXTRA_DIST = fahmon.png
-48x48
+64x64
-fahmoniconspix_DATA = $(EXTRA_DIST)
-all: all-am
@@ -203 +203 @@
-          esac; \
-        done; \
-48
+64
-        cd $(top_srcdir) && \
-48
+64
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

branches/mactest/configure

@@ -6167 +6167 @@
-
-
-mac/Makefile mac/Info.plist po/Makefile.in resources/Makefile src/Makefile src/include/Makefile src/images/Makefile src/images/icons/Makefile src/images/icons/16/Makefile src/images/icons/24/Makefile src/images/icons/32/Makefile src/images/icons/48
+po/Makefile.in resources/Makefile src/Makefile src/include/Makefile src/images/Makefile src/images/icons/Makefile src/images/icons/16/Makefile src/images/icons/24/Makefile src/images/icons/32/Makefile src/images/icons/48/Makefile src/images/icons/64/Makefile src/images/icons/128/Makefile src/images/icons/256
-
-
@@ -6767 +6767 @@
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
-    "mac/Makefile") CONFIG_FILES="$CONFIG_FILES mac/Makefile" ;;
-    "mac/Info.plist") CONFIG_FILES="$CONFIG_FILES mac/Info.plist" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "resources/Makefile") CONFIG_FILES="$CONFIG_FILES resources/Makefile" ;;
@@ -6779 +6777 @@
-    "src/images/icons/32/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/32/Makefile" ;;
-    "src/images/icons/48/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/48/Makefile" ;;
+    "src/images/icons/64/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/64/Makefile" ;;
+    "src/images/icons/128/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/128/Makefile" ;;
+    "src/images/icons/256/Makefile") CONFIG_FILES="$CONFIG_FILES src/images/icons/256/Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

branches/mactest/configure.ac

@@ -67 +67 @@
-   src/images/icons/32/Makefile
-   src/images/icons/48/Makefile
+   src/images/icons/64/Makefile
+   src/images/icons/128/Makefile
+   src/images/icons/256/Makefile
-])
-

branches/mactest/src/images/icons/128/Makefile.in

@@ -16 +16 @@
-
-# Copyright (C) 2007 Andrew Schofield <the.uncle.fungus@gmail.com>
-  
+
-# This file is free software; as a special exception the author gives
- 
+
-# modifications, as long as this notice is preserved.
- 
+
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -47 +47 @@
-build_triplet = @build@
-host_triplet = @host@
-4
+12
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -189 +189 @@
-target_alias = @target_alias@
-EXTRA_DIST = fahmon.png
-48x4
+128x12
-fahmoniconspix_DATA = $(EXTRA_DIST)
-all: all-am
@@ -203 +203 @@
-          esac; \
-        done; \
-4
+12
-        cd $(top_srcdir) && \
-4
+12
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

branches/mactest/src/images/icons/256/Makefile.in

@@ -16 +16 @@
-
-# Copyright (C) 2007 Andrew Schofield <the.uncle.fungus@gmail.com>
-  
+
-# This file is free software; as a special exception the author gives
- 
+
-# modifications, as long as this notice is preserved.
- 
+
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -47 +47 @@
-build_triplet = @build@
-host_triplet = @host@
-48
+256
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -189 +189 @@
-target_alias = @target_alias@
-EXTRA_DIST = fahmon.png
-48x48
+256x256
-fahmoniconspix_DATA = $(EXTRA_DIST)
-all: all-am
@@ -203 +203 @@
-          esac; \
-        done; \
-48
+256
-        cd $(top_srcdir) && \
-48
+256
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

branches/mactest/src/images/icons/64/Makefile.in

@@ -16 +16 @@
-
-# Copyright (C) 2007 Andrew Schofield <the.uncle.fungus@gmail.com>
-  
+
-# This file is free software; as a special exception the author gives
- 
+
-# modifications, as long as this notice is preserved.
- 
+
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -47 +47 @@
-build_triplet = @build@
-host_triplet = @host@
-48
+64
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -189 +189 @@
-target_alias = @target_alias@
-EXTRA_DIST = fahmon.png
-48x48
+64x64
-fahmoniconspix_DATA = $(EXTRA_DIST)
-all: all-am
@@ -203 +203 @@
-          esac; \
-        done; \
-48
+64
-        cd $(top_srcdir) && \
-48
+64
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status