Author: dnusinow
Date: 2006-04-29 15:26:15 -0400 (Sat, 29 Apr 2006)
New Revision: 1997
Added:
trunk/app/xfs-X11R7.0-1.0.1/debian/patches/03_configurable_config_location.diff
Modified:
trunk/app/xfs-X11R7.0-1.0.1/Makefile.in
trunk/app/xfs-X11R7.0-1.0.1/configure
trunk/app/xfs-X11R7.0-1.0.1/debian/changelog
trunk/app/xfs-X11R7.0-1.0.1/debian/patches/series
trunk/app/xfs-X11R7.0-1.0.1/debian/rules
trunk/app/xfs-X11R7.0-1.0.1/debian/xfs.install
Log:
* Move config file back to /etc/X11/fs where it belongs. Thanks to Mike
Brodbelt, Otavio Salvador, and Margarita Manterola. Thanks to
Andreas Metzler for the patch. (closes: #362492)
Modified: trunk/app/xfs-X11R7.0-1.0.1/Makefile.in
===================================================================
--- trunk/app/xfs-X11R7.0-1.0.1/Makefile.in 2006-04-29 19:07:43 UTC (rev
1996)
+++ trunk/app/xfs-X11R7.0-1.0.1/Makefile.in 2006-04-29 19:26:15 UTC (rev
1997)
@@ -151,7 +151,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-configdir = $(libdir)/X11/fs
+configdir = $(sysconfdir)/X11/fs
bin_PROGRAMS = xfs
Modified: trunk/app/xfs-X11R7.0-1.0.1/configure
===================================================================
--- trunk/app/xfs-X11R7.0-1.0.1/configure 2006-04-29 19:07:43 UTC (rev
1996)
+++ trunk/app/xfs-X11R7.0-1.0.1/configure 2006-04-29 19:26:15 UTC (rev
1997)
@@ -940,7 +940,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -2294,8 +2294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2353,8 +2352,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2470,8 +2468,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2525,8 +2522,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2571,8 +2567,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2616,8 +2611,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3228,8 +3222,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3334,8 +3327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3389,8 +3381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3460,8 +3451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3515,8 +3505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3620,8 +3609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3701,8 +3689,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3750,8 +3737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s
conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4779,11 +4765,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -4822,6 +4803,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Modified: trunk/app/xfs-X11R7.0-1.0.1/debian/changelog
===================================================================
--- trunk/app/xfs-X11R7.0-1.0.1/debian/changelog 2006-04-29 19:07:43 UTC
(rev 1996)
+++ trunk/app/xfs-X11R7.0-1.0.1/debian/changelog 2006-04-29 19:26:15 UTC
(rev 1997)
@@ -1,3 +1,11 @@
+xfs (1:1.0.1-5) unstable; urgency=low
+
+ * Move config file back to /etc/X11/fs where it belongs. Thanks to Mike
+ Brodbelt, Otavio Salvador, and Margarita Manterola. Thanks to
+ Andreas Metzler for the patch. (closes: #362492)
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Apr 2006 15:21:23 -0400
+
xfs (1:1.0.1-4) unstable; urgency=low
* Upload to unstable
Added:
trunk/app/xfs-X11R7.0-1.0.1/debian/patches/03_configurable_config_location.diff
===================================================================
---
trunk/app/xfs-X11R7.0-1.0.1/debian/patches/03_configurable_config_location.diff
2006-04-29 19:07:43 UTC (rev 1996)
+++
trunk/app/xfs-X11R7.0-1.0.1/debian/patches/03_configurable_config_location.diff
2006-04-29 19:26:15 UTC (rev 1997)
@@ -0,0 +1,11 @@
+diff -Nur xfs-1.0.1.orig/Makefile.am xfs-1.0.1/Makefile.am
+--- xfs-1.0.1.orig/Makefile.am 2006-03-06 01:13:54.000000000 +0000
++++ xfs-1.0.1/Makefile.am 2006-04-29 16:03:07.000000000 +0000
+@@ -19,7 +19,7 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+
+-configdir = $(libdir)/X11/fs
++configdir = $(sysconfdir)/X11/fs
+
+ bin_PROGRAMS = xfs
Modified: trunk/app/xfs-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- trunk/app/xfs-X11R7.0-1.0.1/debian/patches/series 2006-04-29 19:07:43 UTC
(rev 1996)
+++ trunk/app/xfs-X11R7.0-1.0.1/debian/patches/series 2006-04-29 19:26:15 UTC
(rev 1997)
@@ -1,2 +1,3 @@
01_xfs_fixes.diff -p0
02_debian_setup.diff -p0
+03_configurable_config_location.diff -p1
Modified: trunk/app/xfs-X11R7.0-1.0.1/debian/rules
===================================================================
--- trunk/app/xfs-X11R7.0-1.0.1/debian/rules 2006-04-29 19:07:43 UTC (rev
1996)
+++ trunk/app/xfs-X11R7.0-1.0.1/debian/rules 2006-04-29 19:26:15 UTC (rev
1997)
@@ -43,7 +43,8 @@
mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
+ --infodir=\$${prefix}/share/info \
+ --sysconfdir=/etc $(confflags) \
CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
Modified: trunk/app/xfs-X11R7.0-1.0.1/debian/xfs.install
===================================================================
--- trunk/app/xfs-X11R7.0-1.0.1/debian/xfs.install 2006-04-29 19:07:43 UTC
(rev 1996)
+++ trunk/app/xfs-X11R7.0-1.0.1/debian/xfs.install 2006-04-29 19:26:15 UTC
(rev 1997)
@@ -1,3 +1,3 @@
usr/bin/xfs
usr/share/man/man1/xfs.1x
-usr/lib/X11/fs/config
+usr/lib/X11/fs/config etc/X11/fs
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
