r14832 - in /packages/unstable/gdesklets/debian: changelog control control.in patches/70_relibtoolize.diff
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Fri Feb 29 19:12:14 UTC 2008
Author: manphiz-guest
Date: Fri Feb 29 19:12:13 2008
New Revision: 14832
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14832
Log:
* Drop config.guess and config.sub from 70_relibtoolize.diff:
* Drop python-xml from depends, and update python version to 2.4.
(Closes: #468591)
* Adjust (build-)depends as per configure.in.
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=14832&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Fri Feb 29 19:12:13 2008
@@ -3,13 +3,17 @@
* Run `intltoolize' when relibtoolizing to regenerate intltool-*.in
which solves the `@INTLTOOL_ICONV@ not being substituted' issue. And
drop 10_intltools-merge_fix.diff as no longer needed any more.
+ * Drop config.guess and config.sub from 70_relibtoolize.diff:
* Add python-support to build-depend and run 'dh_pysupport -pgdesklets'
in binary-post-install/gdesklets rule to avoid residues after
purge. Thanks Josselin Mouette and Loïc Minier for suggestions.
(Closes: #466243)
* Fix RC bug, bump urgency.
-
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 01 Mar 2008 00:57:44 +0800
+ * Drop python-xml from depends, and update python version to 2.4.
+ (Closes: #468591)
+ * Adjust (build-)depends as per configure.in.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 01 Mar 2008 03:10:29 +0800
gdesklets (0.35.4-1) unstable; urgency=high
Modified: packages/unstable/gdesklets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control?rev=14832&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control (original)
+++ packages/unstable/gdesklets/debian/control Fri Feb 29 19:12:13 2008
@@ -3,36 +3,37 @@
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Deng Xiyue <manphiz-guest at users.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.49),
debhelper (>= 6),
python-dev,
- python-gnome2-dev,
- python-gtk2-dev,
+ python-gnome2-dev (>= 2.6.0),
+ python-gtk2-dev (>= 2.4.0),
python-pyorbit-dev,
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.6.0-4),
+ libgtop2-dev (>= 2.8.2),
gnome-pkg-tools,
libgnomeui-dev (>= 2.6.1.1-2),
libxml-parser-perl,
- librsvg2-dev,
+ librsvg2-dev (>= 2.8.0),
autotools-dev,
python-support
Standards-Version: 3.7.3
+XS-Python-Version: >= 2.4
Package: gdesklets
Architecture: any
+XB-Python-Version: ${python:Versions}
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- python-gnome2 (>= 2.0),
- python-gtk2 (>= 2.0),
+ python-gnome2 (>= 2.6.0),
+ python-gtk2 (>= 2.4.0),
python-numeric (>= 23.0-7),
- python,
- python-xml,
+ python (>= 2.4),
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=14832&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Fri Feb 29 19:12:13 2008
@@ -3,36 +3,37 @@
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.49),
debhelper (>= 6),
python-dev,
- python-gnome2-dev,
- python-gtk2-dev,
+ python-gnome2-dev (>= 2.6.0),
+ python-gtk2-dev (>= 2.4.0),
python-pyorbit-dev,
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.6.0-4),
+ libgtop2-dev (>= 2.8.2),
gnome-pkg-tools,
libgnomeui-dev (>= 2.6.1.1-2),
libxml-parser-perl,
- librsvg2-dev,
+ librsvg2-dev (>= 2.8.0),
autotools-dev,
python-support
Standards-Version: 3.7.3
+XS-Python-Version: >= 2.4
Package: gdesklets
Architecture: any
+XB-Python-Version: ${python:Versions}
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- python-gnome2 (>= 2.0),
- python-gtk2 (>= 2.0),
+ python-gnome2 (>= 2.6.0),
+ python-gtk2 (>= 2.4.0),
python-numeric (>= 23.0-7),
- python,
- python-xml,
+ python (>= 2.4),
python-pyorbit (>= 2.0.1)
Recommends: gdesklets-data
Replaces: gdesklets-data (<< 0.21)
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=14832&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff (original)
+++ packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff Fri Feb 29 19:12:13 2008
@@ -2352,347 +2352,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.35.4.orig/config.guess gdesklets-0.35.4/config.guess
---- gdesklets-0.35.4.orig/config.guess 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/config.guess 2007-08-17 11:14:13.000000000 +0800
-@@ -1,9 +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 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2006-02-23'
-+timestamp='2007-07-22'
-
- # 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
-@@ -160,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
-@@ -210,7 +212,7 @@
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -328,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*:*)
-@@ -770,6 +772,8 @@
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
-@@ -777,10 +781,7 @@
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-- echo ${UNAME_MACHINE}-pc-mingw32
-- exit ;;
-- i*:MSYS_NT-*:*:*)
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -790,12 +791,15 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[345]*)
-- echo i586-pc-interix${UNAME_RELEASE}
-- exit ;;
-- EM64T:Interix*:[345]*)
-- 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 ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-@@ -831,6 +835,9 @@
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit ;;
-@@ -947,6 +954,9 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-+ xtensa:Linux:*:*)
-+ echo xtensa-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
-@@ -989,7 +999,7 @@
- LIBC=gnulibc1
- # endif
- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
-@@ -1205,6 +1215,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 ;;
-diff -urN gdesklets-0.35.4.orig/config.sub gdesklets-0.35.4/config.sub
---- gdesklets-0.35.4.orig/config.sub 2006-10-05 20:04:42.000000000 +0800
-+++ gdesklets-0.35.4/config.sub 2007-08-17 11:14:13.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2006-02-23'
-+timestamp='2007-06-28'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -240,15 +241,16 @@
- | 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 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | 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 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -274,21 +276,19 @@
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-- m32c)
-- basic_machine=$basic_machine-unknown
-- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-@@ -318,18 +318,18 @@
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | 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-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -358,23 +358,21 @@
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-- m32c-*)
-- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -477,8 +475,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -685,6 +683,10 @@
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -912,6 +914,10 @@
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -923,6 +929,9 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1128,7 +1137,7 @@
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1217,7 +1226,7 @@
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1369,6 +1378,12 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1378,9 +1393,9 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1406,6 +1421,9 @@
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
diff -urN gdesklets-0.35.4.orig/configure gdesklets-0.35.4/configure
--- gdesklets-0.35.4.orig/configure 2006-10-05 20:04:30.000000000 +0800
+++ gdesklets-0.35.4/configure 2008-02-18 20:51:05.000000000 +0800
More information about the pkg-gnome-commits
mailing list