r15014 - in /packages/unstable/gdesklets/debian: changelog control control.in patches/10_manpage_fix.diff patches/70_relibtoolize.diff
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Wed Mar 12 02:53:15 UTC 2008
Author: manphiz-guest
Date: Wed Mar 12 02:53:15 2008
New Revision: 15014
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15014
Log:
* Drop python-xml dependency. It's not even build-depended on.
(Closes: #468591)
* Strip config.guess and config.sub patch from 70_relibtoolize.diff.
* Add 10_manpage_fix.diff to fix a typo in manpage which results in
unexpected definition.
Added:
packages/unstable/gdesklets/debian/patches/10_manpage_fix.diff
Modified:
packages/unstable/gdesklets/debian/changelog
packages/unstable/gdesklets/debian/control
packages/unstable/gdesklets/debian/control.in
packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
Modified: packages/unstable/gdesklets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/changelog?rev=15014&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Wed Mar 12 02:53:15 2008
@@ -1,3 +1,13 @@
+gdesklets (0.36-2) UNRELEASED; urgency=low
+
+ * Drop python-xml dependency. It's not even build-depended on.
+ (Closes: #468591)
+ * Strip config.guess and config.sub patch from 70_relibtoolize.diff.
+ * Add 10_manpage_fix.diff to fix a typo in manpage which results in
+ unexpected definition.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Wed, 12 Mar 2008 10:05:36 +0800
+
gdesklets (0.36-1) unstable; urgency=high
* New upstream release.
Modified: packages/unstable/gdesklets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control?rev=15014&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control (original)
+++ packages/unstable/gdesklets/debian/control Wed Mar 12 02:53:15 2008
@@ -6,34 +6,33 @@
Build-Depends: cdbs (>= 0.4.49),
debhelper (>= 6),
python-dev,
- python-gnome2-dev (>= 2.6.0),
- python-gtk2-dev (>= 2.4.0),
- python-pyorbit-dev,
+ python-gnome2-dev (>= 2.12.0),
+ python-gtk2-dev (>= 2.10.0),
+ python-pyorbit-dev (>= 2.0.1),
libglib2.0-dev (>= 2.4.1-2),
pkg-config,
swig,
- libgtk2.0-dev (>= 2.4.1-3),
- libgnomevfs2-dev (>= 2.8.4),
- libgtop2-dev (>= 2.8.2),
+ libglib2.0-dev (>= 2.10.0)
+ libgtk2.0-dev (>= 2.10.0),
+ libgtop2-dev (>= 2.6.0-4),
gnome-pkg-tools,
- libgnomeui-dev (>= 2.6.1.1-2),
libxml-parser-perl,
librsvg2-dev (>= 2.8.0),
autotools-dev,
- python-support
+ python-support (>= 0.3)
Standards-Version: 3.7.3
-XS-Python-Version: >= 2.4
+XS-Python-Version: >= 2.3
Package: gdesklets
Architecture: any
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: ${python:Version}
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- python-gnome2 (>= 2.6.0),
- python-gtk2 (>= 2.4.0),
+ python-gnome2 (>= 2.10.0),
+ python-gtk2 (>= 2.10.0),
python-numeric (>= 23.0-7),
- python (>= 2.4),
+ python,
python-pyorbit (>= 2.0.1)
Recommends: gdesklets-data
Replaces: gdesklets-data (<< 0.21)
Modified: packages/unstable/gdesklets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control.in?rev=15014&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Wed Mar 12 02:53:15 2008
@@ -33,7 +33,6 @@
python-gtk2 (>= 2.10.0),
python-numeric (>= 23.0-7),
python,
- python-xml,
python-pyorbit (>= 2.0.1)
Recommends: gdesklets-data
Replaces: gdesklets-data (<< 0.21)
Added: packages/unstable/gdesklets/debian/patches/10_manpage_fix.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/patches/10_manpage_fix.diff?rev=15014&op=file
==============================================================================
--- packages/unstable/gdesklets/debian/patches/10_manpage_fix.diff (added)
+++ packages/unstable/gdesklets/debian/patches/10_manpage_fix.diff Wed Mar 12 02:53:15 2008
@@ -1,0 +1,11 @@
+--- gdesklets-0.36/doc/man/gdesklets.1~ 2008-03-12 10:02:01.000000000 +0800
++++ gdesklets-0.36/doc/man/gdesklets.1 2008-03-12 10:02:11.000000000 +0800
+@@ -182,7 +182,7 @@
+ http://develbook.gdesklets.de
+ .PP
+ A printed reference in German language is available from
+-'Software & Support Verlag GmbH'. The book 'Exploring Python' covers desklet
++ 'Software & Support Verlag GmbH'. The book 'Exploring Python' covers desklet
+ development on 34 pages.
+ .PP
+ You can meet the 'gDesklets' developers and other fans on the IRC channel
Modified: packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff?rev=15014&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff (original)
+++ packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff Wed Mar 12 02:53:15 2008
@@ -2880,323 +2880,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN gdesklets-0.36.orig/config.guess gdesklets-0.36/config.guess
---- gdesklets-0.36.orig/config.guess 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/config.guess 2008-03-01 01:27:36.000000000 +0800
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# Free Software Foundation, Inc.
-
--timestamp='2006-07-02'
-+timestamp='2008-01-23'
-
- # 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
-@@ -56,8 +56,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
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
-@@ -161,6 +161,7 @@
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -329,7 +330,7 @@
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
-@@ -531,7 +532,7 @@
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[45])
-+ *:AIX:*:[456])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -780,7 +781,7 @@
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -790,12 +791,18 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[3456]*)
-- echo i586-pc-interix${UNAME_RELEASE}
-- exit ;;
-- EM64T:Interix*:[3456]*)
-- echo x86_64-unknown-interix${UNAME_RELEASE}
-- exit ;;
-+ *:Interix*:[3456]*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T | authenticamd)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ IA64)
-+ echo ia64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-@@ -829,7 +836,14 @@
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- arm*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ eval $set_cc_for_build
-+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_EABI__
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -950,6 +964,9 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
-@@ -1208,6 +1225,15 @@
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-@@ -1458,9 +1484,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff -urN gdesklets-0.36.orig/config.sub gdesklets-0.36/config.sub
---- gdesklets-0.36.orig/config.sub 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/config.sub 2008-03-01 01:27:36.000000000 +0800
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# Free Software Foundation, Inc.
-
--timestamp='2006-09-20'
-+timestamp='2008-01-16'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -72,8 +72,8 @@
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
-@@ -245,12 +245,12 @@
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | fr30 | frv \
-+ | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -324,7 +324,7 @@
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
-@@ -369,10 +369,14 @@
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-- | xstormy16-* | xtensa-* \
-+ | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-*)
- ;;
-+ # Recognize the basic CPU types without company name, with glob match.
-+ xtensa*)
-+ basic_machine=$basic_machine-unknown
-+ ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -443,6 +447,14 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ blackfin)
-+ basic_machine=bfin-unknown
-+ os=-linux
-+ ;;
-+ blackfin-*)
-+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -475,8 +487,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -668,6 +680,14 @@
- basic_machine=m68k-isi
- os=-sysv
- ;;
-+ m68knommu)
-+ basic_machine=m68k-unknown
-+ os=-linux
-+ ;;
-+ m68knommu-*)
-+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
-@@ -683,6 +703,10 @@
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -809,6 +833,14 @@
- basic_machine=i860-intel
- os=-osf
- ;;
-+ parisc)
-+ basic_machine=hppa-unknown
-+ os=-linux
-+ ;;
-+ parisc-*)
-+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- pbd)
- basic_machine=sparc-tti
- ;;
-@@ -925,6 +957,9 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1014,6 +1049,10 @@
- basic_machine=tic6x-unknown
- os=-coff
- ;;
-+ tile*)
-+ basic_machine=tile-unknown
-+ os=-linux-gnu
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
-@@ -1219,7 +1258,7 @@
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1414,6 +1453,9 @@
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
diff -urN gdesklets-0.36.orig/configure gdesklets-0.36/configure
--- gdesklets-0.36.orig/configure 2008-02-17 01:45:36.000000000 +0800
+++ gdesklets-0.36/configure 2008-03-01 01:27:26.000000000 +0800
More information about the pkg-gnome-commits
mailing list