tags 475230 + patch
thanks
The attached patch changes the src/Makefile.* to get the extension path from
pkg-config, which should be enough to work with nautilus >= 2.22.
I've also attached a debdiff, including all changes for an experimental
upload to test this.
--
Regards,
Andreas Henriksson
diff -uri nautilus-share-0.7.1.orig/src/Makefile.am nautilus-share-0.7.1/src/Makefile.am
--- nautilus-share-0.7.1.orig/src/Makefile.am 2006-03-26 15:50:44.000000000 +0200
+++ nautilus-share-0.7.1/src/Makefile.am 2008-04-10 22:31:40.000000000 +0200
@@ -10,8 +10,7 @@
$(LIBGLADE_CFLAGS) \
$(GLIB_CFLAGS)
-# FIXME: get this from the .pc file
-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir=`pkg-config --variable=extensiondir libnautilus-extension`
nautilus_extension_LTLIBRARIES=libnautilus-share.la
diff -uri nautilus-share-0.7.1.orig/src/Makefile.in nautilus-share-0.7.1/src/Makefile.in
--- nautilus-share-0.7.1.orig/src/Makefile.in 2006-10-21 13:01:17.000000000 +0200
+++ nautilus-share-0.7.1/src/Makefile.in 2008-04-10 22:32:05.000000000 +0200
@@ -244,9 +244,7 @@
$(LIBGLADE_CFLAGS) \
$(GLIB_CFLAGS)
-
-# FIXME: get this from the .pc file
-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir = `pkg-config --variable=extensiondir libnautilus-extension`
nautilus_extension_LTLIBRARIES = libnautilus-share.la
libnautilus_share_la_SOURCES = \
nautilus-share.c \
diff -u nautilus-share-0.7.1/debian/control nautilus-share-0.7.1/debian/control
--- nautilus-share-0.7.1/debian/control
+++ nautilus-share-0.7.1/debian/control
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Thierry Randrianiriana <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autotools-dev, intltool (>= 0.29), libgnomeui-dev, libnautilus-extension-dev, libglade2-dev, libeel2-dev
+Build-Depends: debhelper (>= 5), autotools-dev, intltool (>= 0.29), libgnomeui-dev, libnautilus-extension-dev (>= 2.22.0), libglade2-dev, libeel2-dev
Standards-Version: 3.7.2
Package: nautilus-share
diff -u nautilus-share-0.7.1/debian/changelog nautilus-share-0.7.1/debian/changelog
--- nautilus-share-0.7.1/debian/changelog
+++ nautilus-share-0.7.1/debian/changelog
@@ -1,3 +1,14 @@
+nautilus-share (0.7.1-2.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules: add dpatch support.
+ * Add patch to get nautilus extension directory from pkg-config.
+ * debian/control: Make libnautilus-extension-dev a versioned dependency
+ against >= 2.22.0, to make experimental upload build against the
+ experimental version to try out the new 2.0 extension.
+
+ -- Andreas Henriksson <[EMAIL PROTECTED]> Thu, 10 Apr 2008 22:39:18 +0200
+
nautilus-share (0.7.1-2) unstable; urgency=low
* Upload to unstable
diff -u nautilus-share-0.7.1/debian/rules nautilus-share-0.7.1/debian/rules
--- nautilus-share-0.7.1/debian/rules
+++ nautilus-share-0.7.1/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpatch/dpatch.make
+
#export DH_VERBOSE=1
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -23,7 +25,7 @@
--infodir=\$${prefix}/share/info
-build: build-stamp
+build: patch build-stamp
build-stamp: config.status
dh_testdir
@@ -32,7 +34,7 @@
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp intltool-update intltool-extract intltool-merge
diff -u nautilus-share-0.7.1/config.guess nautilus-share-0.7.1/config.guess
--- nautilus-share-0.7.1/config.guess
+++ nautilus-share-0.7.1/config.guess
@@ -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='2007-03-06'
+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."
@@ -330,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*:*)
@@ -532,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
@@ -793,12 +793,15 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ 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
@@ -833,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
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,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 -u nautilus-share-0.7.1/config.sub nautilus-share-0.7.1/config.sub
--- nautilus-share-0.7.1/config.sub
+++ nautilus-share-0.7.1/config.sub
@@ -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='2007-01-18'
+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."
@@ -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
;;
@@ -1017,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
only in patch2:
unchanged:
--- nautilus-share-0.7.1.orig/debian/patches/01_ext_dir.dpatch
+++ nautilus-share-0.7.1/debian/patches/01_ext_dir.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_ext_dir.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Get nautilus extension directory from pkg-config
+
[EMAIL PROTECTED]@
+
+diff -uri nautilus-share-0.7.1.orig/src/Makefile.am nautilus-share-0.7.1/src/Makefile.am
+--- nautilus-share-0.7.1.orig/src/Makefile.am 2006-03-26 15:50:44.000000000 +0200
++++ nautilus-share-0.7.1/src/Makefile.am 2008-04-10 22:31:40.000000000 +0200
+@@ -10,8 +10,7 @@
+ $(LIBGLADE_CFLAGS) \
+ $(GLIB_CFLAGS)
+
+-# FIXME: get this from the .pc file
+-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
++nautilus_extensiondir=`pkg-config --variable=extensiondir libnautilus-extension`
+
+ nautilus_extension_LTLIBRARIES=libnautilus-share.la
+
+diff -uri nautilus-share-0.7.1.orig/src/Makefile.in nautilus-share-0.7.1/src/Makefile.in
+--- nautilus-share-0.7.1.orig/src/Makefile.in 2006-10-21 13:01:17.000000000 +0200
++++ nautilus-share-0.7.1/src/Makefile.in 2008-04-10 22:32:05.000000000 +0200
+@@ -244,9 +244,7 @@
+ $(LIBGLADE_CFLAGS) \
+ $(GLIB_CFLAGS)
+
+-
+-# FIXME: get this from the .pc file
+-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0
++nautilus_extensiondir = `pkg-config --variable=extensiondir libnautilus-extension`
+ nautilus_extension_LTLIBRARIES = libnautilus-share.la
+ libnautilus_share_la_SOURCES = \
+ nautilus-share.c \
only in patch2:
unchanged:
--- nautilus-share-0.7.1.orig/debian/patches/00list
+++ nautilus-share-0.7.1/debian/patches/00list
@@ -0,0 +1 @@
+01_ext_dir.dpatch
