[Pkg-samba-maint] r3258 - in branches/samba/experimental/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2010-01-30 13:00:44 +0000 (Sat, 30 Jan 2010)
New Revision: 3258

Removed:
   branches/samba/experimental/debian/patches/codepages-location.patch
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/series
   branches/samba/experimental/debian/rules
Log:
Drop codepages-location.patch as the codepages location is now
configurable


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2010-01-28 19:03:28 UTC (rev 3257)
+++ branches/samba/experimental/debian/changelog	2010-01-30 13:00:44 UTC (rev 3258)
@@ -1,8 +1,10 @@
-samba (2:3.5.0~rc2~dfsg-1) UNRELEASED; urgency=low
+samba (2:3.5.0~rc2~dfsg-1) UNRELEASED-experimental; urgency=low
 
   * New upstream pre-release
+  * Use new --with-codepagedir option. Consequently drop
+    codepages-location.patch
 
- -- Christian Perrier <bubulle at debian.org>  Thu, 28 Jan 2010 20:02:32 +0100
+ -- Christian Perrier <bubulle at debian.org>  Thu, 28 Jan 2010 20:04:50 +0100
 
 samba (2:3.5.0~rc1~dfsg-1) experimental; urgency=low
 

Deleted: branches/samba/experimental/debian/patches/codepages-location.patch
===================================================================
--- branches/samba/experimental/debian/patches/codepages-location.patch	2010-01-28 19:03:28 UTC (rev 3257)
+++ branches/samba/experimental/debian/patches/codepages-location.patch	2010-01-30 13:00:44 UTC (rev 3258)
@@ -1,19 +0,0 @@
-Description: Move codepage files to the datadir
- "codepagedir" is not configurable and the leads to build failures.
-Author: Christian Perrier <bubulle at debian.org>
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=6444
-Forwarded: yes
-
-Index: experimental/source3/Makefile.in
-===================================================================
---- experimental.orig/source3/Makefile.in
-+++ experimental/source3/Makefile.in
-@@ -167,7 +167,7 @@
- STATEDIR = @statedir@
- 
- # Where to look for (and install) codepage databases.
--CODEPAGEDIR = @codepagedir@
-+CODEPAGEDIR = @datadir@
- 
- # the directory where pid files go
- PIDDIR = @piddir@

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2010-01-28 19:03:28 UTC (rev 3257)
+++ branches/samba/experimental/debian/patches/series	2010-01-30 13:00:44 UTC (rev 3258)
@@ -10,5 +10,4 @@
 usershare.patch
 smbtar-bashism.patch
 no-unnecessary-cups.patch
-codepages-location.patch
 autoconf.patch

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2010-01-28 19:03:28 UTC (rev 3257)
+++ branches/samba/experimental/debian/rules	2010-01-30 13:00:44 UTC (rev 3258)
@@ -58,6 +58,7 @@
 		--with-lockdir=/var/run/samba \
 		--with-statedir=/var/lib/samba \
 		--with-cachedir=/var/cache/samba \
+		--with-codepagedir=/usr/share/samba \
 		--enable-external-libtalloc \
 		--without-libtalloc \
 		--disable-avahi