xbase-clients: Changes to 'debian-experimental'
beforelight/Makefile.in | 2 +-
debian/changelog | 3 ++-
debian/patches/16_beforelight_install_app-defaults.diff | 13 +++++++++++++
debian/patches/series | 1 +
4 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 161b383c3cdb801b0f5d79341381a3d96322830f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 19 10:47:37 2007 +0100
* New patch to install beforelight's app-defaults file correctly.
diff --git a/beforelight/Makefile.in b/beforelight/Makefile.in
index dee4c6d..7748bdb 100644
--- a/beforelight/Makefile.in
+++ b/beforelight/Makefile.in
@@ -183,7 +183,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
# App default files (*.ad)
-appdefaultdir = $(DESTDIR)@appdefaultdir@
+appdefaultdir = @appdefaultdir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
diff --git a/debian/changelog b/debian/changelog
index f1cda49..fd7bc74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xbase-clients (1:7.2.ds2-1) experimental
* Update to xrandr 1.2.0.
* Build-dep on libxrandr 1.2.0.
+ * New patch to install beforelight's app-defaults file correctly.
- -- Julien Cristau <jcristau@debian.org> Mon, 19 Feb 2007 10:00:26 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 19 Feb 2007 10:46:11 +0100
xbase-clients (1:7.2.ds1-2) experimental; urgency=low
diff --git a/debian/patches/16_beforelight_install_app-defaults.diff b/debian/patches/16_beforelight_install_app-defaults.diff
new file mode 100644
index 0000000..35286f8
--- /dev/null
+++ b/debian/patches/16_beforelight_install_app-defaults.diff
@@ -0,0 +1,13 @@
+Index: xbase-clients/beforelight/Makefile.am
+===================================================================
+--- xbase-clients.orig/beforelight/Makefile.am 2007-02-19 10:44:32.000000000 +0100
++++ xbase-clients/beforelight/Makefile.am 2007-02-19 10:44:40.000000000 +0100
+@@ -33,7 +33,7 @@
+
+ # App default files (*.ad)
+
+-appdefaultdir = $(DESTDIR)@appdefaultdir@
++appdefaultdir = @appdefaultdir@
+
+ EXTRA_DIST = \
+ Beforelight.ad
diff --git a/debian/patches/series b/debian/patches/series
index 3b8b2e4..67bdf2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
13_xconsole_implicit_pointer_conversion.diff
14_SECURITY_setuid.diff
15_xmore_fix_segv_without_xprint.diff -p2
+16_beforelight_install_app-defaults.diff
Reply to: