diff -u adonthell-data-0.3.4.cvs.20050903/debian/changelog adonthell-data-0.3.4.cvs.20050903/debian/changelog --- adonthell-data-0.3.4.cvs.20050903/debian/changelog +++ adonthell-data-0.3.4.cvs.20050903/debian/changelog @@ -1,9 +1,31 @@ +adonthell-data (0.3.4.cvs.20050903-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + New desktop file + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Arthur Loiret Sun, 3 Jun 2007 17:59:42 +0200 + adonthell-data (0.3.4.cvs.20050903-3) unstable; urgency=low * Orphan package, set maintainer to Debian QA Group -- Gordon Fraser Sat, 02 Jun 2007 07:22:32 +0200 +adonthell-data (0.3.4.cvs.20050903-2.2ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Mon, 15 Jan 2007 17:53:28 +0000 + +adonthell-data (0.3.4.cvs.20050903-2.2ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Ubuntu changes are as follows: + - Add .desktop file. + - Update Italian translation. + + -- Luke Yelavich Thu, 16 Nov 2006 17:01:26 +1100 + adonthell-data (0.3.4.cvs.20050903-2.2) unstable; urgency=low * Non-maintainer upload. @@ -27,6 +49,14 @@ -- Gürkan Sengün Sat, 7 Oct 2006 18:13:52 +0200 +adonthell-data (0.3.4.cvs.20050903-2ubuntu1) edgy; urgency=low + + * Re-sync with Debian + * python2.3->python2.4 + * Re-add .desktop file + + -- Barry deFreese Thu, 20 Jul 2006 21:43:03 -0400 + adonthell-data (0.3.4.cvs.20050903-2) unstable; urgency=low * Fix spelling mistake in description (Closes: #362714) @@ -83,0 +114 @@ + diff -u adonthell-data-0.3.4.cvs.20050903/debian/control adonthell-data-0.3.4.cvs.20050903/debian/control --- adonthell-data-0.3.4.cvs.20050903/debian/control +++ adonthell-data-0.3.4.cvs.20050903/debian/control @@ -1,7 +1,8 @@ Source: adonthell-data Section: games Priority: optional -Maintainer: Debian QA Group +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian QA Group Build-Depends-Indep: python-dev, adonthell (>= 0.3), adonthell (<< 0.4), python-support (>= 0.4.0) Build-Depends: debhelper (>= 4), quilt Standards-Version: 3.7.2 diff -u adonthell-data-0.3.4.cvs.20050903/debian/rules adonthell-data-0.3.4.cvs.20050903/debian/rules --- adonthell-data-0.3.4.cvs.20050903/debian/rules +++ adonthell-data-0.3.4.cvs.20050903/debian/rules @@ -61,6 +61,8 @@ INSTALL_PROGRAM="$(INSTALL_PROGRAM)" # gamedatadir="$(CURDIR)/debian/adonthell-data/usr/share/games/adonthell-data" + mkdir -p $(CURDIR)/debian/adonthell-data/usr/share/applications + install -m 644 $(CURDIR)/debian/desktop $(CURDIR)/debian/adonthell-data/usr/share/applications/adonthell-data.desktop # Build architecture-independent files here. binary-indep: build install diff -u adonthell-data-0.3.4.cvs.20050903/config.guess adonthell-data-0.3.4.cvs.20050903/config.guess --- adonthell-data-0.3.4.cvs.20050903/config.guess +++ adonthell-data-0.3.4.cvs.20050903/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2006-07-02' # 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 @@ -161,7 +161,6 @@ 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 @@ -781,7 +780,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -791,15 +790,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 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 ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -954,9 +950,6 @@ 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 @@ -1215,15 +1208,6 @@ 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 -u adonthell-data-0.3.4.cvs.20050903/config.sub adonthell-data-0.3.4.cvs.20050903/config.sub --- adonthell-data-0.3.4.cvs.20050903/config.sub +++ adonthell-data-0.3.4.cvs.20050903/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | 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 | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,9 +925,6 @@ basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1222,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1417,9 +1414,6 @@ m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;;