--- system-config-samba-1.2.63.orig/debian/system-config-samba.8 +++ system-config-samba-1.2.63/debian/system-config-samba.8 @@ -0,0 +1,25 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH SYSTEM-CONFIG-SAMBA 8 "Jun 12, 2007" +.SH NAME +system-config-samba \- GUI for managing Samba shares and users +.SH SYNOPSIS +.B system-config-samba +.SH DESCRIPTION +This manual page documents briefly the +.B system-config-samba +command. +.PP +.B system-config-samba +is a program that provides a graphical interface for managing Samba users and shares. +.SH SEE ALSO +.BR samba (7) +.br +The program is fully documented at +.nh +.I file:///usr/share/doc/system-config-samba/index.html +.hy +.SH AUTHOR +redhat-config-samba was written by Brent Fox . +.PP +This manual page was written by Soren Hansen , +for Ubuntu (but may be used by others). --- system-config-samba-1.2.63.orig/debian/system-config-samba.install +++ system-config-samba-1.2.63/debian/system-config-samba.install @@ -0,0 +1 @@ +debian/tmp/usr --- system-config-samba-1.2.63.orig/debian/copyright +++ system-config-samba-1.2.63/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Soren Hansen on +Thu, 31 May 2007 08:59:20 +0200. + +It was downloaded from http://mirrors.dotsrc.org/fedora/6/source/SRPMS/system-config-samba-1.2.35-1.1.src.rpm + +Upstream Author: + + Brent Fox + +Copyright: + +src/samba-share.py: + Copyright (C) 2004 Red Hat, Inc. + Copyright (C) 2004 Brent Fox + +All other files: + Copyright (C) 2002, 2003 Red Hat, Inc. + Copyright (C) 2002, 2003 Brent Fox + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +For the full license, please see `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is (C) 2007, Soren Hansen and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- system-config-samba-1.2.63.orig/debian/pycompat +++ system-config-samba-1.2.63/debian/pycompat @@ -0,0 +1 @@ +2 --- system-config-samba-1.2.63.orig/debian/system-config-samba.docs +++ system-config-samba-1.2.63/debian/system-config-samba.docs @@ -0,0 +1 @@ +doc/* --- system-config-samba-1.2.63.orig/debian/compat +++ system-config-samba-1.2.63/debian/compat @@ -0,0 +1 @@ +5 --- system-config-samba-1.2.63.orig/debian/system-config-samba.manpages +++ system-config-samba-1.2.63/debian/system-config-samba.manpages @@ -0,0 +1 @@ +debian/system-config-samba.8 --- system-config-samba-1.2.63.orig/debian/changelog +++ system-config-samba-1.2.63/debian/changelog @@ -0,0 +1,46 @@ +system-config-samba (1.2.63-0ubuntu4) intrepid; urgency=low + + * debian/patches/02_get_rid_of_rhpl (LP: #280872) + - Ported old patch to quilt and new source tarball (thanks + to Brian Murray). + + -- Chris Coulson Thu, 16 Oct 2008 21:45:53 +0100 + +system-config-samba (1.2.63-0ubuntu3) intrepid; urgency=low + + * Missing build-dependencies: + - rarian-compat + - pkg-config + - gnome-doc-utils + * debian/patches/06_bashisms.patch: + - Fix another bashism which caused a FTBFS. + + -- Luca Falavigna Thu, 09 Oct 2008 00:39:54 +0200 + +system-config-samba (1.2.63-0ubuntu2) intrepid; urgency=low + + * Replace dpatch dependency with a quilt ditto. + + -- Soren Hansen Wed, 28 May 2008 09:40:48 +0200 + +system-config-samba (1.2.63-0ubuntu1) intrepid; urgency=low + + * New upstream release. + * Switch to quilt for patch management. + + -- Soren Hansen Wed, 14 May 2008 10:23:51 +0200 + +system-config-samba (1.2.50-0ubuntu2) gutsy; urgency=low + + * Remove writeSmbPasswdFile from old patch. + * Add descriptions for the included dpatches. + * Don't use python-disutils cdbs class. + + -- Soren Hansen Mon, 10 Sep 2007 10:11:52 +0200 + +system-config-samba (1.2.50-0ubuntu1) gutsy; urgency=low + + * Initial release + + -- Soren Hansen Sat, 01 Sep 2007 13:47:34 +0200 + --- system-config-samba-1.2.63.orig/debian/rules +++ system-config-samba-1.2.63/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM=pycentral +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_MAKE_CLEAN_TARGET := clean + +clean:: + make -C po clean + +binary-install/system-config-samba:: + dh_pycentral /usr/share/system-config-samba + dh_desktop + dh_icons + +install/system-config-samba:: + rm debian/tmp/usr/bin/system-config-samba + rmdir debian/tmp/usr/bin + install -d debian/tmp/usr/sbin/ + ln -s /usr/share/system-config-samba/system-config-samba.py debian/tmp/usr/sbin/system-config-samba + +# Temporary rule until the author starts being more "upstream"-ish and publishes the tarballs directly +get-orig-source:: + test -f system-config-samba.spec && mv system-config-samba.spec system-config-samba.spec.tmp + + wget http://koji.fedoraproject.org/packages/system-config-samba/1.2.63/1.fc9/src/system-config-samba-1.2.63-1.fc9.src.rpm + rpm2cpio *.src.rpm | cpio -i + bunzip2 -c system-config-samba-*.tar.bz2 | gzip -c > `basename system-config-samba*.bz2 .bz2`.gz + rm system-config-samba-*.src.rpm system-config-samba-*.bz2 system-config-samba.spec + + test -f system-config-samba.spec.tmp && mv system-config-samba.spec.tmp system-config-samba.spec + --- system-config-samba-1.2.63.orig/debian/control +++ system-config-samba-1.2.63/debian/control @@ -0,0 +1,15 @@ +Source: system-config-samba +Section: admin +Priority: optional +Maintainer: Ubuntu MOTU Developers +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, intltool, python-central (>= 0.5.6), python-all-dev (>= 2.3.5-11), rarian-compat, pkg-config, gnome-doc-utils +Standards-Version: 3.7.2 +XS-Python-Version: current + +Package: system-config-samba +Architecture: all +Depends: ${python:Depends}, samba, python-libuser +XB-Python-Version: ${python:Versions} +Description: GUI for managing samba shares and users + system-config-samba is a graphical user interface for creating, + modifying, and deleting samba shares and users. --- system-config-samba-1.2.63.orig/debian/patches/series +++ system-config-samba-1.2.63/debian/patches/series @@ -0,0 +1,4 @@ +02_get_rid_of_rhpl +03_sysvrc.patch +04_desktop.patch +06_bashisms.patch --- system-config-samba-1.2.63.orig/debian/patches/02_get_rid_of_rhpl +++ system-config-samba-1.2.63/debian/patches/02_get_rid_of_rhpl @@ -0,0 +1,120 @@ +Index: system-config-samba-1.2.63/src/addUserWin.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/addUserWin.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/addUserWin.py 2008-10-16 21:40:15.000000000 +0100 +@@ -28,8 +28,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + gtk.glade.bindtextdomain(domain) +Index: system-config-samba-1.2.63/src/basicPreferencesWin.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/basicPreferencesWin.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/basicPreferencesWin.py 2008-10-16 21:40:15.000000000 +0100 +@@ -30,8 +30,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + gtk.glade.bindtextdomain(domain) +Index: system-config-samba-1.2.63/src/mainWindow.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/mainWindow.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/mainWindow.py 2008-10-16 21:40:15.000000000 +0100 +@@ -36,8 +36,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + gtk.glade.bindtextdomain(domain) +Index: system-config-samba-1.2.63/src/sambaBackend.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/sambaBackend.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/sambaBackend.py 2008-10-16 21:40:15.000000000 +0100 +@@ -27,8 +27,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + +Index: system-config-samba-1.2.63/src/sambaParser.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/sambaParser.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/sambaParser.py 2008-10-16 21:40:15.000000000 +0100 +@@ -32,8 +32,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + +Index: system-config-samba-1.2.63/src/sambaUserData.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/sambaUserData.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/sambaUserData.py 2008-10-16 21:40:15.000000000 +0100 +@@ -28,8 +28,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + gtk.glade.bindtextdomain(domain) +Index: system-config-samba-1.2.63/src/sambaUserWin.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/sambaUserWin.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/sambaUserWin.py 2008-10-16 21:40:15.000000000 +0100 +@@ -30,8 +30,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + gtk.glade.bindtextdomain(domain) +Index: system-config-samba-1.2.63/src/shareWindow.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/shareWindow.py 2008-10-16 21:38:08.000000000 +0100 ++++ system-config-samba-1.2.63/src/shareWindow.py 2008-10-16 21:40:15.000000000 +0100 +@@ -32,8 +32,8 @@ + ## + ## I18N + ## +-from rhpl.translate import _, N_ +-import rhpl.translate as translate ++from gettext import gettext as _ ++import gettext as translate + domain = 'system-config-samba' + translate.textdomain (domain) + gtk.glade.bindtextdomain(domain) --- system-config-samba-1.2.63.orig/debian/patches/03_sysvrc.patch +++ system-config-samba-1.2.63/debian/patches/03_sysvrc.patch @@ -0,0 +1,54 @@ +Index: system-config-samba-1.2.63/src/sambaBackend.py +=================================================================== +--- system-config-samba-1.2.63.orig/src/sambaBackend.py 2008-05-14 10:19:58.103105290 +0200 ++++ system-config-samba-1.2.63/src/sambaBackend.py 2008-05-14 10:23:18.831105104 +0200 +@@ -34,46 +34,11 @@ + + class SambaBackend: + +- def nmbIsService (self): +- # Check if nmb is its own service +- s = os.system ('/sbin/chkconfig --list nmb >& /dev/null') +- if s == 0: +- return True +- else: +- return False +- + def isSambaRunning (self): +- services = [ ('smb', 'smbd') ] +- +- if self.nmbIsService (): +- services.append ( ('nmb', 'nmbd') ) +- +- for service, procname in services: +- fd = os.popen ('LC_MESSAGES=C /sbin/service %s status' % service) +- lines = fd.readlines () +- fd.close () +- +- for line in lines: +- if string.find (line, procname) >= 0: +- if not string.find (line, 'running') > 0: +- return False +- +- return True ++ return os.path.exists('/var/run/samba/smbd.pid') + + def startSamba(self): +- services = ['smb'] +- +- if self.nmbIsService (): +- services.append ('nmb') +- +- for service in services: +- os.system ('/sbin/service %s start > /dev/null' % service) ++ os.system ('/usr/sbin/invoke-rc.d samba start > /dev/null') + + def restartSamba(self): +- services = ['smb'] +- +- if self.nmbIsService (): +- services.append ('nmb') +- +- for service in services: +- os.system ('/sbin/service %s restart > /dev/null' % service) ++ os.system ('/usr/sbin/invoke-rc.d samba restart > /dev/null') --- system-config-samba-1.2.63.orig/debian/patches/04_desktop.patch +++ system-config-samba-1.2.63/debian/patches/04_desktop.patch @@ -0,0 +1,26 @@ +Fix desktop file +- Make .desktop file compliant: + + Don't use absolute path in Exec. + + Add gksu to Exec. + + Add Version and Encoding. + + Remove Application and add Network to Categories. + + +Index: system-config-samba-1.2.63/system-config-samba.desktop.in +=================================================================== +--- system-config-samba-1.2.63.orig/system-config-samba.desktop.in 2008-05-14 10:19:58.099103332 +0200 ++++ system-config-samba-1.2.63/system-config-samba.desktop.in 2008-05-14 10:23:23.606602899 +0200 +@@ -1,9 +1,11 @@ + [Desktop Entry] ++Version=1.0 ++Encoding=UTF-8 + _Name=Samba + _Comment=Create, modify, and delete samba shares + Categories=System;Settings; +-Icon=system-config-samba.png +-Exec=/usr/bin/system-config-samba ++Icon=system-config-samba ++Exec=gksu system-config-samba + Type=Application + StartupNotify=true + Terminal=false --- system-config-samba-1.2.63.orig/debian/patches/06_bashisms.patch +++ system-config-samba-1.2.63/debian/patches/06_bashisms.patch @@ -0,0 +1,35 @@ +Index: system-config-samba-1.2.63/doc_rules.mk +=================================================================== +--- system-config-samba-1.2.63.orig/doc_rules.mk 2008-04-08 15:05:50.000000000 +0200 ++++ system-config-samba-1.2.63/doc_rules.mk 2008-10-09 00:35:52.565998841 +0200 +@@ -79,7 +79,7 @@ + echo "The file '$(SK_CONTENTS_LIST)' does not exist." >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } +- xsltproc -o $@ $(call docbook2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ++ xsltproc -o $@ $(call docbook2omf_args,$@,$<,'docbook') || ( rm -f "$@"; exit 1; ) + + $(_DOC_COMPLETE): $(_DOC_C_DOCS) + $(XMLLINT) --postvalid --noblanks --noent --nsclean "$<" > "$@" +@@ -94,7 +94,7 @@ + cp $(_DOC_POT) $@; \ + else \ + (cd $(dir $@) && \ +- $(MSGMERGE) -o $(notdir $@).tmp $(notdir $@) $(_DOC_POT) >&/dev/null && \ ++ $(MSGMERGE) -o $(notdir $@).tmp $(notdir $@) $(_DOC_POT) > /dev/null 2>&1 && \ + $(call po_diff_and_mv_or_rm,$(notdir $@),$(notdir $@).tmp)); \ + fi + +Index: system-config-samba-1.2.63/po/Makefile +=================================================================== +--- system-config-samba-1.2.63.orig/po/Makefile 2008-04-08 15:05:50.000000000 +0200 ++++ system-config-samba-1.2.63/po/Makefile 2008-10-09 00:33:11.580805467 +0200 +@@ -44,7 +44,7 @@ + fi + + po_diff_and_mv_or_rm_func = \ +- function po_diff_and_mv_or_rm () { \ ++ po_diff_and_mv_or_rm() { \ + $(call po_diff_and_mv_or_rm,$$1,$$2) \ + } +