diff -u efax-gtk-3.0.15/config.guess efax-gtk-3.0.15/config.guess --- efax-gtk-3.0.15/config.guess +++ efax-gtk-3.0.15/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-03-06' # 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,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 @@ -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,15 @@ 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 ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,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 @@ -1208,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 -u efax-gtk-3.0.15/config.sub efax-gtk-3.0.15/config.sub --- efax-gtk-3.0.15/config.sub +++ efax-gtk-3.0.15/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +timestamp='2007-01-18' # 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 \ - | 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-* \ @@ -925,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1219,7 +1222,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 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff -u efax-gtk-3.0.15/debian/changelog efax-gtk-3.0.15/debian/changelog --- efax-gtk-3.0.15/debian/changelog +++ efax-gtk-3.0.15/debian/changelog @@ -1,3 +1,10 @@ +efax-gtk (3.0.15-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Update the debian/menu according to the previus version of the package + + -- Nicolas Valcárcel Scerpella (aka nxvl) Tue, 23 Oct 2007 03:56:44 -0500 + efax-gtk (3.0.15-1) unstable; urgency=low * New upstream release @@ -5,6 +12,24 @@ -- Lior Kaplan Mon, 16 Jul 2007 00:03:09 +0300 +efax-gtk (3.0.14-1ubuntu1) gutsy; urgency=low + + * Add menu icon (LP: #108746): + - Add icon "stock_send-fax.xpm" from gnome-icon-theme in /debian + - Install the icon using debian/install in + /usr/share/icons/hicolor/24x24/apps + * Update the .desktop file in line with freedesktop.org guidelines: + - Add 01-efax-gtk.desktop.dpatch patch in debian/patches + + Remove the Encoding field (deprecated) + + Remove Application in the Categories field (deprecated) + + Remove the icon's extension + * Add dpatch support in debian/control and debian/rules + * Modify debian/menu in line with new menu hierarchy + * Modify Maintainer value to match Debian-Maintainer-Field Spec + * Add debian/dirs + + -- Christophe Sauthier Wed, 26 Sep 2007 09:56:34 +0200 + efax-gtk (3.0.14-1) unstable; urgency=low * New upstream release @@ -162,0 +188 @@ + diff -u efax-gtk-3.0.15/debian/dirs efax-gtk-3.0.15/debian/dirs --- efax-gtk-3.0.15/debian/dirs +++ efax-gtk-3.0.15/debian/dirs @@ -1 +1,4 @@ +usr/share/applications +usr/share/icons/hicolor/24x24/apps +usr/share/pixmaps var/spool/fax diff -u efax-gtk-3.0.15/debian/menu efax-gtk-3.0.15/debian/menu --- efax-gtk-3.0.15/debian/menu +++ efax-gtk-3.0.15/debian/menu @@ -1,2 +1,2 @@ -?package(efax-gtk):needs="X11" section="Applications/Network"\ +?package(efax-gtk):needs="X11" section="Applications/Network/File Transfer"\ title="efax-gtk" command="/usr/bin/efax-gtk" diff -u efax-gtk-3.0.15/debian/control efax-gtk-3.0.15/debian/control --- efax-gtk-3.0.15/debian/control +++ efax-gtk-3.0.15/debian/control @@ -1,8 +1,9 @@ Source: efax-gtk Section: comm Priority: optional -Maintainer: Lior Kaplan -Build-Depends: debhelper (>= 5.0.0), libsigc++-2.0-dev, libgtk2.0-dev, gettext +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Lior Kaplan +Build-Depends: debhelper (>= 5.0.0), libsigc++-2.0-dev, libgtk2.0-dev, gettext, dpatch Standards-Version: 3.7.2 Package: efax-gtk diff -u efax-gtk-3.0.15/debian/rules efax-gtk-3.0.15/debian/rules --- efax-gtk-3.0.15/debian/rules +++ efax-gtk-3.0.15/debian/rules @@ -15,6 +15,8 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# Include dpatch stuff. +include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -39,7 +41,7 @@ build: build-stamp -build-stamp: config.status +build-stamp: patch-stamp config.status dh_testdir # Add here commands to compile the package. @@ -48,7 +50,7 @@ touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp @@ -83,6 +85,7 @@ binary-arch: build install dh_testdir dh_testroot + dh_install dh_installchangelogs ChangeLog dh_installdocs dh_installexamples only in patch2: unchanged: --- efax-gtk-3.0.15.orig/debian/stock_send-fax.xpm +++ efax-gtk-3.0.15/debian/stock_send-fax.xpm @@ -0,0 +1,60 @@ +/* XPM */ +static char * stock_send_fax_xpm[] = { +"24 24 33 1", +" c None", +". c #000100", +"+ c #1C0804", +"@ c #363734", +"# c #434441", +"$ c #9B2C12", +"% c #545551", +"& c #BC3417", +"* c #954837", +"= c #D33B1B", +"- c #676863", +"; c #E04019", +"> c #B85843", +", c #75746F", +"' c #E45436", +") c #82827C", +"! c #D16D57", +"~ c #E36B4E", +"{ c #90918B", +"] c #CC7F6D", +"^ c #E8755E", +"/ c #E77B64", +"( c #E58670", +"_ c #A2A4A1", +": c #E89381", +"< c #B3B5B1", +"[ c #C5C7C4", +"} c #D0D2CF", +"| c #DCDEDB", +"1 c #E4E6E2", +"2 c #EBEDEA", +"3 c #F3F5F1", +"4 c #FBFDFA", +" ", +" ............ ", +" .[4444444443<. ", +" .4||2|||||||<. ", +" .4--)2-_||||<. ", +" .42222222222[. ", +" .4{-_2{_2_{2[. ", +" .. .44444444444}. ", +" .](..2_<2<4<_}24[. ", +".!::;+[}|||||||2|}. ", +".:::;._,-)},,})_}<.. ", +".::/.+){__________.). ", +".](~.#@++++++++..,)_<. ", +".*:^.-[244444444444441. ", +" .(/=.<224344333211_1<. ", +" .](^&.{[<}<}_}<}<|-{{. ", +" ..!~~$.)2_..|22224%){. ", +" .@+!^'=...*~.@####%),. ", +" .)@.!(''~/~;=+#%%%--,. ", +" .,)@.>~^^^;&&.#%,-,,-. ", +" ......&==&$..++..... ", +" .)__{#.....@%){{{)). ", +" .................. ", +" "}; only in patch2: unchanged: --- efax-gtk-3.0.15.orig/debian/install +++ efax-gtk-3.0.15/debian/install @@ -0,0 +1,3 @@ +efax-gtk.desktop /usr/share/applications +debian/stock_send-fax.xpm /usr/share/icons/hicolor/24x24/apps +debian/stock_send-fax.xpm /usr/share/pixmaps only in patch2: unchanged: --- efax-gtk-3.0.15.orig/debian/patches/00list +++ efax-gtk-3.0.15/debian/patches/00list @@ -0,0 +1 @@ +01-efax-gtk.desktop only in patch2: unchanged: --- efax-gtk-3.0.15.orig/debian/patches/01-efax-gtk.desktop.dpatch +++ efax-gtk-3.0.15/debian/patches/01-efax-gtk.desktop.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-efax-gtk.desktop.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Update the .desktop file in line with freedesktop.org guidelines: +## DP: - Remove the Encoding field (deprecated) +## DP: - Remove Application in the Categories field (deprecated) +## DP: - Remove the icon's extension + +@DPATCH@ +diff -urNad efax-gtk-3.0.14~/efax-gtk.desktop efax-gtk-3.0.14/efax-gtk.desktop +--- efax-gtk-3.0.14~/efax-gtk.desktop 2007-09-26 00:22:59.000000000 +0200 ++++ efax-gtk-3.0.14/efax-gtk.desktop 2007-09-26 01:34:38.000000000 +0200 +@@ -1,6 +1,5 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Efax-gtk + Name[zh_TW]=傳真 + Name[he_IL]=תוכנת פקסים efax-gtk +@@ -9,7 +8,7 @@ + Comment[he_IL]=ממשק גרפי עבור תוכנת הפקסים efax + TryExec=efax-gtk + Exec=efax-gtk +-Icon=stock_send-fax.png ++Icon=stock_send-fax + Terminal=false + Type=Application +-Categories=Application;Office;GTK; ++Categories=Office;GTK;