[Pkg-samba-maint] r2870 - in trunk/samba-gtk: . debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-06-19 15:54:27 +0000 (Fri, 19 Jun 2009)
New Revision: 2870

Modified:
   trunk/samba-gtk/Makefile
   trunk/samba-gtk/autogen.sh
   trunk/samba-gtk/debian/build-orig.sh
   trunk/samba-gtk/debian/changelog
   trunk/samba-gtk/debian/control
   trunk/samba-gtk/debian/samba-gtk-frontends.install
Log:
merge upstream

Modified: trunk/samba-gtk/Makefile
===================================================================
--- trunk/samba-gtk/Makefile	2009-06-19 15:42:46 UTC (rev 2869)
+++ trunk/samba-gtk/Makefile	2009-06-19 15:54:27 UTC (rev 2870)
@@ -30,6 +30,7 @@
 	$(INSTALL) -m 0644 meta/* $(DESTDIR)$(appdir)
 	$(INSTALL) -d $(DESTDIR)$(includedir)
 	$(INSTALL) -m 0644 $(HEADERS) $(DESTDIR)$(includedir)
+	$(INSTALL) -d $(DESTDIR)$(pythondir)
 	$(INSTALL) -m 0755 sambagtk.$(SHLIBEXT) $(DESTDIR)$(pythondir)
 
 install-doc:: doc

Modified: trunk/samba-gtk/autogen.sh
===================================================================
--- trunk/samba-gtk/autogen.sh	2009-06-19 15:42:46 UTC (rev 2869)
+++ trunk/samba-gtk/autogen.sh	2009-06-19 15:54:27 UTC (rev 2870)
@@ -1,4 +1,2 @@
 #!/bin/sh
-aclocal
-autoheader
-autoconf -f
+autoreconf -i

Modified: trunk/samba-gtk/debian/build-orig.sh
===================================================================
--- trunk/samba-gtk/debian/build-orig.sh	2009-06-19 15:42:46 UTC (rev 2869)
+++ trunk/samba-gtk/debian/build-orig.sh	2009-06-19 15:54:27 UTC (rev 2870)
@@ -15,6 +15,6 @@
 git clone --depth 1 -l $GIT_URL "samba-gtk-$version"
 
 rm -rf "samba-gtk-$version/.git"
-pushd "samba-gtk-$version" && ./autogen.sh && popd
+pushd "samba-gtk-$version" && ./autogen.sh && rm -rf autom4te.cache && popd
 tar cvz "samba-gtk-$version" > "samba-gtk_$version.orig.tar.gz"
 rm -rf "samba-gtk-$version"

Modified: trunk/samba-gtk/debian/changelog
===================================================================
--- trunk/samba-gtk/debian/changelog	2009-06-19 15:42:46 UTC (rev 2869)
+++ trunk/samba-gtk/debian/changelog	2009-06-19 15:54:27 UTC (rev 2870)
@@ -1,4 +1,4 @@
-samba-gtk (0.0.1~bzr59-1) experimental; urgency=low
+samba-gtk (0.0.1~bzr61-1) experimental; urgency=low
 
   * Initial release. (Closes: #413822)
 

Modified: trunk/samba-gtk/debian/control
===================================================================
--- trunk/samba-gtk/debian/control	2009-06-19 15:42:46 UTC (rev 2869)
+++ trunk/samba-gtk/debian/control	2009-06-19 15:54:27 UTC (rev 2870)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Samba Debian Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jelmer at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
 Build-Depends: libgtk2.0-dev, libgconf2-dev, debhelper (>> 5.0.0), docbook-xsl, docbook-xml, xsltproc, samba4-dev, python, libgensec-dev, libregistry-dev, python-dev, python-central (>= 0.5.6), python, python-gtk2-dev, libgnome-keyring-dev
 XS-Python-Version: 2.5
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba-gtk

Modified: trunk/samba-gtk/debian/samba-gtk-frontends.install
===================================================================
--- trunk/samba-gtk/debian/samba-gtk-frontends.install	2009-06-19 15:42:46 UTC (rev 2869)
+++ trunk/samba-gtk/debian/samba-gtk-frontends.install	2009-06-19 15:54:27 UTC (rev 2870)
@@ -7,4 +7,5 @@
 usr/share/man/man1/gepdump.1
 usr/share/man/man1/gwsvcctl.1
 usr/share/man/man1/gwcrontab.1
+usr/share/man/man1/gtkldb.1
 usr/share/applications/*.desktop