diff -pruN 0.4-2.1/config.guess 0.4-2.1ubuntu1/config.guess
--- 0.4-2.1/config.guess 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/config.guess 2012-08-10 14:06:25.000000000 +0000
@@ -2,9 +2,9 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-05-11'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see .
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -792,13 +790,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -807,6 +804,9 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -943,7 +953,7 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff -pruN 0.4-2.1/config.sub 0.4-2.1ubuntu1/config.sub
--- 0.4-2.1/config.sub 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/config.sub 2012-08-10 14:06:25.000000000 +0000
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-03-23'
+timestamp='2012-04-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see .
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -223,6 +225,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -247,17 +255,22 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +304,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +313,7 @@ case $basic_machine in
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +328,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -329,7 +341,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -352,11 +367,13 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +382,10 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +419,7 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +427,11 @@ case $basic_machine in
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -711,7 +731,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -808,10 +827,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -1120,13 +1147,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1336,7 +1358,7 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1521,6 +1543,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
@@ -1548,9 +1573,6 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
diff -pruN 0.4-2.1/debian/changelog 0.4-2.1ubuntu1/debian/changelog
--- 0.4-2.1/debian/changelog 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/debian/changelog 2012-08-10 14:06:25.000000000 +0000
@@ -1,3 +1,17 @@
+gcolor2 (0.4-2.1ubuntu1) quantal; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - src/interface.c: Use stock Gtk "about" button for better desktop
+ integration.
+ - debian/rules: Don't ignore errors in clean target.
+ - debian/control:
+ - Depend on ${misc:Depends}.
+ - Move homepage to the proper Homepage field.
+ - debian/gcolor2.menu: "Apps" section has been moved to "Applications".
+ - debian/copyright: Make lintian happy.
+
+ -- Colin Watson Fri, 10 Aug 2012 14:10:43 +0100
+
gcolor2 (0.4-2.1) unstable; urgency=low
* Non-maintainer upload.
@@ -8,6 +22,26 @@ gcolor2 (0.4-2.1) unstable; urgency=low
-- gregor herrmann Sat, 05 Nov 2011 15:59:22 +0100
+gcolor2 (0.4-2ubuntu2) oneiric; urgency=low
+
+ * aclocal.m4: Add an extra layer of quoting to ltmain.sh sanity check
+ (closes: #634606, LP: #831236).
+
+ -- Colin Watson Thu, 15 Sep 2011 23:39:39 +0100
+
+gcolor2 (0.4-2ubuntu1) maverick; urgency=low
+
+ * src/interface.c: Use stock Gtk "about" button for better desktop
+ integration. Thanks to Alessio Bolognino. (LP: #313283)
+ * debian/rules: Don't ignore errors in clean target.
+ * debian/control:
+ - Depend on ${misc:Depends}.
+ - Move homepage to the proper Homepage field.
+ * debian/gcolor2.menu: "Apps" section has been moved to "Applications".
+ * debian/copyright: Make lintian happy.
+
+ -- Andrew Starr-Bochicchio Tue, 24 Aug 2010 15:39:32 -0400
+
gcolor2 (0.4-2) unstable; urgency=low
* Change main.c to use stdlib.h for amd64 problems (closes: Bug#347816).
diff -pruN 0.4-2.1/debian/control 0.4-2.1ubuntu1/debian/control
--- 0.4-2.1/debian/control 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/debian/control 2012-08-10 14:06:25.000000000 +0000
@@ -1,17 +1,17 @@
Source: gcolor2
Section: gnome
Priority: optional
-Maintainer: Carlos C Soto
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Carlos C Soto
Uploaders: David Moreno Garza
Build-Depends: debhelper (>= 4.0.0), autotools-dev, libgtk2.0-dev, perl, libxml-perl
Standards-Version: 3.6.2
+Homepage: http://gcolor2.sourceforge.net/
Package: gcolor2
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Simple GTK2 color selector and picker
Gcolor2 is a simple GTK2 color selector to provide a quick and easy
way to find colors for whatever task is at hand.
Colors can be saved and deleted as well.
- .
- Homepage: http://gcolor2.sourceforge.net/
diff -pruN 0.4-2.1/debian/copyright 0.4-2.1ubuntu1/debian/copyright
--- 0.4-2.1/debian/copyright 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/debian/copyright 2012-08-10 14:06:25.000000000 +0000
@@ -4,7 +4,7 @@ Sat, 16 Apr 2005 16:01:39 -0500.
It was downloaded from http://mesh.dl.sourceforge.net/sourceforge/gcolor2/gcolor2-0.3.tar.gz
with project page http://gcolor2.sourceforge.net
-Copyright Holder: Justin Spadea
+Copyright: 2004-2005, Justin Spadea
License:
@@ -24,5 +24,5 @@ License:
MA 02110-1301, USA.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff -pruN 0.4-2.1/debian/gcolor2.menu 0.4-2.1ubuntu1/debian/gcolor2.menu
--- 0.4-2.1/debian/gcolor2.menu 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/debian/gcolor2.menu 2012-08-10 14:06:25.000000000 +0000
@@ -1,3 +1,3 @@
-?package(gcolor2):needs="X11" section="Apps/Tools"\
+?package(gcolor2):needs="X11" section="Applications/Graphics"\
title="gcolor2" command="/usr/bin/gcolor2"\
icon="/usr/share/pixmaps/gcolor2/gcolor2.xpm"
diff -pruN 0.4-2.1/debian/rules 0.4-2.1ubuntu1/debian/rules
--- 0.4-2.1/debian/rules 2012-08-10 14:06:25.000000000 +0000
+++ 0.4-2.1ubuntu1/debian/rules 2012-08-10 14:06:25.000000000 +0000
@@ -47,7 +47,7 @@ clean:
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
diff -pruN 0.4-2.1/gcolor2.glade 0.4-2.1ubuntu1/gcolor2.glade
--- 0.4-2.1/gcolor2.glade 2005-07-11 14:50:37.000000000 +0000
+++ 0.4-2.1ubuntu1/gcolor2.glade 2012-08-10 14:06:25.000000000 +0000
@@ -1,828 +1,544 @@
-
-
-
+
-
-
- 1
- True
- gcolor2
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- False
- False
- icon.png
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_NORMAL
- GDK_GRAVITY_NORTH_WEST
- True
-
-
-
-
- 10
- True
- False
- 3
-
-
-
- True
- True
- False
-
-
-
- 0
- False
- True
-
-
-
-
-
- True
- True
- False
- 0
-
-
-
- True
- False
- 0
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 5
- False
- False
-
-
-
-
-
- 5
- 220
- True
- False
- 4
-
-
-
- True
- GTK_BUTTONBOX_DEFAULT_STYLE
- 0
-
-
-
- True
- False
- Delete the selected color. You can only delete those you saved yourself.
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- Save the color selected in the colorwheel
- True
- True
- gtk-save
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- 1
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_OUT
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- True
- False
- True
- False
- False
- False
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- _Show saved colors
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- label_item
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- 10
- True
-
-
- 0
- False
- False
-
-
-
-
-
- True
- GTK_BUTTONBOX_DEFAULT_STYLE
- 0
-
-
-
- True
- About gcolor2
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- about_icon.png
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _About
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
-
-
-
- True
- Exit the program
- True
- True
- gtk-quit
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- 0
- False
- True
-
-
-
-
-
-
-
- 10
- True
- gcolor2 - Save a Color
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER_ON_PARENT
- True
- False
- True
- icon.png
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- False
- True
- True
- True
- gtk-save
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_CENTER
- True
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 3
- False
- False
-
-
-
-
-
- True
- Enter a name for the color you selected
- True
- True
- True
- True
- 0
-
- True
- *
- True
-
-
-
- 5
- False
- False
-
-
-
-
-
-
-
-
-
- 10
- 400
- 350
- True
- About gcolor2
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- False
- True
- icon.png
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_NORMAL
- GDK_GRAVITY_NORTH_WEST
- True
- True
-
-
-
-
- True
- False
- 5
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- True
- True
- gtk-close
- True
- GTK_RELIEF_NORMAL
- True
- -7
-
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- True
- icon.png
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 10
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- GTK_POS_TOP
- False
- False
-
-
-
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- True
- 0
- 0
- 0
- 5
- 0
- 0
-
-
-
-
-
- False
- True
-
-
-
-
-
- True
- _Credits
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
-
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- True
- 0
- 0
- 0
- 5
- 0
- 0
-
-
-
-
-
- False
- True
-
-
-
-
-
- True
- _Release Notes
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- Copyright © 2004-2005 Justin Spadea
- False
- True
- GTK_JUSTIFY_CENTER
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 5
- False
- False
-
-
-
-
-
-
-
- 10
- True
- gcolor2 - Delete a Color
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER_ON_PARENT
- True
- False
- True
- icon.png
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_CENTER
- True
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 3
- False
- False
-
-
-
-
-
-
+
+
+
+ True
+ 1
+ gcolor2
+ False
+ icon.png
+
+
+
+ True
+ 10
+ 3
+
+
+ True
+ True
+
+
+
+ False
+ 0
+
+
+
+
+ True
+ True
+
+
+ True
+
+
+ True
+
+
+ False
+ False
+ 5
+ 0
+
+
+
+
+ 220
+ True
+ 5
+ 4
+
+
+ True
+
+
+ gtk-delete
+ True
+ False
+ True
+ True
+ False
+ Delete the selected color. You can only delete those you saved yourself.
+ True
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ gtk-save
+ True
+ True
+ True
+ False
+ Save the color selected in the colorwheel
+ True
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ True
+ True
+ 1
+ automatic
+ automatic
+ out
+
+
+ True
+ True
+ True
+
+
+
+
+
+
+ 1
+
+
+
+
+ 1
+
+
+
+
+
+
+ True
+ _Show saved colors
+ True
+
+
+ label_item
+
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ 10
+ True
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+
+
+ gtk-about
+ True
+ True
+ True
+ False
+ About gcolor2
+ True
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ gtk-quit
+ True
+ True
+ True
+ False
+ Exit the program
+ True
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ 3
+
+
+
+
+
+
+ True
+ 10
+ gcolor2 - Save a Color
+ False
+ True
+ center-on-parent
+ True
+ icon.png
+ dialog
+
+
+ True
+
+
+ True
+ center
+ True
+
+
+ False
+ False
+ 3
+ 2
+
+
+
+
+ True
+ True
+ True
+ Enter a name for the color you selected
+ True
+
+
+
+ False
+ False
+ 5
+ 3
+
+
+
+
+ True
+ end
+
+
+ gtk-cancel
+ -6
+ True
+ True
+ True
+ False
+ True
+
+
+ False
+ False
+ 0
+
+
+
+
+ gtk-save
+ -5
+ True
+ False
+ True
+ True
+ True
+ False
+ True
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ end
+ 0
+
+
+
+
+
+
+
+ 400
+ 350
+ True
+ 10
+ About gcolor2
+ False
+ True
+ icon.png
+ normal
+
+
+
+ True
+ 5
+
+
+ True
+ icon.png
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+
+
+ False
+ False
+ 10
+ 3
+
+
+
+
+ True
+ True
+
+
+ True
+ True
+ never
+ automatic
+ in
+
+
+ True
+ True
+ False
+ word
+ 5
+
+
+
+
+
+
+ True
+ _Credits
+ True
+
+
+ False
+ tab
+
+
+
+
+ True
+ True
+ never
+ automatic
+ in
+
+
+ True
+ True
+ False
+ word
+ 5
+
+
+
+
+ 1
+
+
+
+
+ True
+ _Release Notes
+ True
+
+
+ 1
+ False
+ tab
+
+
+
+
+ 4
+
+
+
+
+ True
+ Copyright © 2004-2005 Justin Spadea
+ True
+ center
+
+
+ False
+ False
+ 5
+ 5
+
+
+
+
+ True
+ end
+
+
+ gtk-close
+ -7
+ True
+ True
+ True
+ True
+ True
+ False
+ True
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ False
+ end
+ 0
+
+
+
+
+
+
+ True
+ 10
+ gcolor2 - Delete a Color
+ False
+ True
+ center-on-parent
+ True
+ icon.png
+ dialog
+
+
+ True
+
+
+ True
+ center
+ True
+
+
+ False
+ False
+ 3
+ 2
+
+
+
+
+ True
+ end
+
+
+ gtk-cancel
+ -6
+ True
+ True
+ True
+ True
+ True
+ False
+ True
+
+
+ False
+ False
+ 0
+
+
+
+
+ gtk-delete
+ -5
+ True
+ True
+ True
+ False
+ True
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ end
+ 0
+
+
+
+
+
diff -pruN 0.4-2.1/src/interface.c 0.4-2.1ubuntu1/src/interface.c
--- 0.4-2.1/src/interface.c 2005-07-11 14:30:33.000000000 +0000
+++ 0.4-2.1ubuntu1/src/interface.c 2012-08-10 14:06:25.000000000 +0000
@@ -46,10 +46,6 @@ create_gcolor2 (void)
GtkWidget *hseparator1;
GtkWidget *hbuttonbox3;
GtkWidget *about_button;
- GtkWidget *alignment1;
- GtkWidget *hbox2;
- GtkWidget *image3;
- GtkWidget *label5;
GtkWidget *quit_button;
GtkTooltips *tooltips;
@@ -136,28 +132,12 @@ create_gcolor2 (void)
gtk_widget_show (hbuttonbox3);
gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox3, FALSE, TRUE, 0);
- about_button = gtk_button_new ();
+ about_button = gtk_button_new_from_stock ("gtk-about");
gtk_widget_show (about_button);
gtk_container_add (GTK_CONTAINER (hbuttonbox3), about_button);
GTK_WIDGET_SET_FLAGS (about_button, GTK_CAN_DEFAULT);
gtk_tooltips_set_tip (tooltips, about_button, _("About gcolor2"), NULL);
- alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment1);
- gtk_container_add (GTK_CONTAINER (about_button), alignment1);
-
- hbox2 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox2);
- gtk_container_add (GTK_CONTAINER (alignment1), hbox2);
-
- image3 = create_pixmap (gcolor2, "about_icon.png");
- gtk_widget_show (image3);
- gtk_box_pack_start (GTK_BOX (hbox2), image3, FALSE, FALSE, 0);
-
- label5 = gtk_label_new_with_mnemonic (_("_About"));
- gtk_widget_show (label5);
- gtk_box_pack_start (GTK_BOX (hbox2), label5, FALSE, FALSE, 0);
-
quit_button = gtk_button_new_from_stock ("gtk-quit");
gtk_widget_show (quit_button);
gtk_container_add (GTK_CONTAINER (hbuttonbox3), quit_button);
@@ -206,10 +186,6 @@ create_gcolor2 (void)
GLADE_HOOKUP_OBJECT (gcolor2, hseparator1, "hseparator1");
GLADE_HOOKUP_OBJECT (gcolor2, hbuttonbox3, "hbuttonbox3");
GLADE_HOOKUP_OBJECT (gcolor2, about_button, "about_button");
- GLADE_HOOKUP_OBJECT (gcolor2, alignment1, "alignment1");
- GLADE_HOOKUP_OBJECT (gcolor2, hbox2, "hbox2");
- GLADE_HOOKUP_OBJECT (gcolor2, image3, "image3");
- GLADE_HOOKUP_OBJECT (gcolor2, label5, "label5");
GLADE_HOOKUP_OBJECT (gcolor2, quit_button, "quit_button");
GLADE_HOOKUP_OBJECT_NO_REF (gcolor2, tooltips, "tooltips");