Bug#588368: diff for 3-days delayed NMU 1.3.1-5.1

Wed, 07 Jul 2010 12:24:22 -0700 

Package: slim

Hi,

I've uploaded a NMU for slim to delayed/3, attached is the diff.

Regards,
Daniel

-- 
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baum...@panthera-systems.net
Internet:       http://people.panthera-systems.net/~daniel-baumann/

diff -Naurp slim.old/debian/README.source slim/debian/README.source
--- slim.old/debian/README.source	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/README.source	2010-07-07 19:19:11.056022374 +0000
@@ -2,4 +2,3 @@ This package uses the dpatch system of p
 See /usr/share/doc/dpatch/README.source.gz for more details.
 
  -- Nobuhiro Iwamatsu <iwama...@debian.org>, Mon, 07 Sep 2009 01:33:36 +0900
-
diff -Naurp slim.old/debian/changelog slim/debian/changelog
--- slim.old/debian/changelog	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/changelog	2010-07-07 19:19:11.104019958 +0000
@@ -1,3 +1,15 @@
+slim (1.3.1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Removing useless whitespaces from EOL and EOF in debian files.
+  * Adding depends to xauth (Closes: #587320).
+  * Updating slim-conf.patch to match the debian defaults for path from
+    login.defs (Closes: #581775).
+  * Adding updated Danish debconf translations from Joe Dalton
+    <joedalt...@yahoo.dk> (Closes: #587800).
+
+ -- Daniel Baumann <dan...@debian.org>  Wed, 07 July 2010 20:54:27 +0200
+
 slim (1.3.1-5) unstable; urgency=low
 
   * Update debian/control.
@@ -11,7 +23,7 @@ slim (1.3.1-4) unstable; urgency=low
 
   * Fix FTBFS with GCC 4.4. (Closes: #553703)
     Update patches/ftbfs_gcc_4.4.patch
-  * Update 20slim_locale. (Closes: #536541) 
+  * Update 20slim_locale. (Closes: #536541)
 
  -- Nobuhiro Iwamatsu <iwama...@debian.org>  Mon, 07 Dec 2009 23:15:33 +0900
 
@@ -38,8 +50,8 @@ slim (1.3.1-1) unstable; urgency=low
   * New Maintainer (Nobuhiro Iwamatsu).
   * New upstream release.
   * Update Standards-Version.
-  * Update patch. 
-    Makefile.patch slim-conf.patch 
+  * Update patch.
+    Makefile.patch slim-conf.patch
   * Remove patch.
     ftbfs-gcc4.3-cfg.cpp.patch
 
@@ -118,4 +130,3 @@ slim (1.2.6-1) unstable; urgency=low
 
 
  -- Mike Massonnet <mmasson...@gmail.com>  Thu,  5 Apr 2007 11:18:33 +0200
-
diff -Naurp slim.old/debian/control slim/debian/control
--- slim.old/debian/control	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/control	2010-07-07 19:19:11.104019958 +0000
@@ -11,7 +11,7 @@ Homepage: http://slim.berlios.de/
 Package: slim
 Architecture: any
 Provides: x-display-manager
-Recommends: xterm 
+Recommends: xterm
 Suggests: scrot
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0
 Description: desktop-independent graphical login manager for X11
diff -Naurp slim.old/debian/copyright slim/debian/copyright
--- slim.old/debian/copyright	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/copyright	2010-07-07 19:19:11.056022374 +0000
@@ -26,7 +26,7 @@ License:
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The Debian packaging is (C) 2007, Mike Massonnet <mmasson...@gmail.com> 
+The Debian packaging is (C) 2007, Mike Massonnet <mmasson...@gmail.com>
 and is licensed under the GPL, see above.
 
 Image handling code adapted and extended from xplanet 1.0.1,
diff -Naurp slim.old/debian/local/Xsession.d/20slim_locale slim/debian/local/Xsession.d/20slim_locale
--- slim.old/debian/local/Xsession.d/20slim_locale	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/local/Xsession.d/20slim_locale	2010-07-07 19:19:11.153021653 +0000
@@ -6,4 +6,3 @@ do
 		export $lt_var
 		fi"
 done
-
diff -Naurp slim.old/debian/patches/slim-conf.patch slim/debian/patches/slim-conf.patch
--- slim.old/debian/patches/slim-conf.patch	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/patches/slim-conf.patch	2010-07-07 19:19:11.153021653 +0000
@@ -6,7 +6,7 @@
 -default_path        ./:/bin:/usr/bin:/usr/local/bin
 -default_xserver     /usr/bin/X
 -#xserver_arguments   -dpi 75
-+default_path        /bin:/usr/bin:/usr/local/bin:/usr/bin/X11
++default_path        /usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
 +default_xserver     /usr/bin/X11/X
 +xserver_arguments   -nolisten tcp
  
diff -Naurp slim.old/debian/po/da.po slim/debian/po/da.po
--- slim.old/debian/po/da.po	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/po/da.po	2010-07-07 19:19:11.136042189 +0000
@@ -1,49 +1,30 @@
-# debconf templates for xorg-x11 package
-# Danish translation
-#
-# $Id: da.po 1042 2006-01-09 07:55:08Z ender $
-#
-# Copyrights:
+# Danish translation slim.
+# Copyright (C) 2010 slim & nedenstående oversættere.
+# This file is distributed under the same license as the slim package.
 # Branden Robinson, 2000-2004
 # Dennis Haney, 2002
 # Morten Brix Pedersen <mor...@wtf.dk>, 2003.
 # Claus Hindsgaul <clau...@image.dk>, 2004, 2005.
-#
-# This file is distributed under the same license as the xorg-x11 package.
-# Please see debian/copyright.
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# Joe Hansen <joedalt...@yahoo.dk>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xorg-x11 6.8.2.dfsg.1-5+SVN\n"
+"Project-Id-Version: slim\n"
 "Report-Msgid-Bugs-To: mmasson...@gmail.com\n"
 "POT-Creation-Date: 2007-05-31 08:04+0200\n"
-"PO-Revision-Date: 2005-08-29 17:06+0200\n"
-"Last-Translator: Claus Hindsgaul <clau...@image.dk>\n"
-"Language-Team: Danish <da...@klid.dk>\n"
+"PO-Revision-Date: 2010-07-01 17:34+0000\n"
+"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n"
+"Language-Team: Danish <da...@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: select
 #. Description
 #: ../slim.templates:2001
-#, fuzzy
 msgid "Default display manager:"
-msgstr "Vælg den ønskede logindhåndtering."
+msgstr "Standardlogindhåndtering:"
 
 #. Type: select
 #. Description
@@ -52,61 +33,31 @@ msgid ""
 "A display manager is a program that provides graphical login capabilities "
 "for the X Window System."
 msgstr ""
-"En logindhåndtering er et program der giver et grafisk logind til X Window-"
+"En logindhåndtering er et program, der giver et grafisk logind til X Window-"
 "systemet."
 
 #. Type: select
 #. Description
 #: ../slim.templates:2001
-#, fuzzy
 msgid ""
 "Only one display manager can manage a given X server, but multiple display "
 "manager packages are installed. Please select which display manager should "
 "run by default."
 msgstr ""
-"Der kan kun køre én logindhåndtering for hver X-server, men der er "
-"installeret flere logindhåndteringer Vælg hvilken logindhåndtering der skal "
+"Der kan kun køre en logindhåndtering for hver X-server, men der er "
+"installeret flere håndteringspakker. Vælg hvilken logindhåndtering der skal "
 "benyttes som standard."
 
 #. Type: select
 #. Description
 #: ../slim.templates:2001
-#, fuzzy
 msgid ""
 "Multiple display managers can run simultaneously if they are configured to "
 "manage different servers; to achieve this, configure the display managers "
 "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
 "check for a default display manager."
 msgstr ""
-"(Flere logindhåndteringer kan køre samtidig. hvis de er sat op til at "
-"håndtere forskellige servere. For at få dette til at fungere, skal "
-"logindhåndteringenerne sættes op til det. Det gør du ved at fjerne tjekket "
-"for standard logindhåndtering i deres initialiseringsskripter i /etc/init.d.)"
-
-#, fuzzy
-#~ msgid "Stop the xdm daemon?"
-#~ msgstr "Vil du stoppe xdm-dæmonen?"
-
-#, fuzzy
-#~ msgid ""
-#~ "The X display manager (xdm) daemon is typically stopped on package "
-#~ "upgrade and removal, but it appears to be managing at least one running X "
-#~ "session."
-#~ msgstr ""
-#~ "X-logindhåndteringsdæmonen (xdm) stoppes typisk under opgradering eller "
-#~ "afinstallation af pakken, men det ser ud til at der allerede kører mindst "
-#~ "én X-session. Hvis xdm bliver stoppet nu, vil alle de X-sessioner, den "
-#~ "håndterer, blive afbrudt. Ellers kan du lade xdm køre, så den nye version "
-#~ "først bliver taget i brug næste gang dæmonen bliver genstartet."
-
-#, fuzzy
-#~ msgid ""
-#~ "If xdm is stopped now, any X sessions it manages will be terminated. "
-#~ "Otherwise, the new version will take effect the next time the daemon is "
-#~ "restarted."
-#~ msgstr ""
-#~ "X-logindhåndteringsdæmonen (xdm) stoppes typisk under opgradering eller "
-#~ "afinstallation af pakken, men det ser ud til at der allerede kører mindst "
-#~ "én X-session. Hvis xdm bliver stoppet nu, vil alle de X-sessioner, den "
-#~ "håndterer, blive afbrudt. Ellers kan du lade xdm køre, så den nye version "
-#~ "først bliver taget i brug næste gang dæmonen bliver genstartet."
+"Flere logindhåndteringer kan køre samtidig, hvis de er sat op til at "
+"håndtere forskellige servere. For at få dette til at fungere, skal "
+"logindhåndteringerne sættes op til det. Det gør du ved at fjerne tjekket "
+"for standardlogindhåndtering i deres initialiseringsskripter i /etc/init.d."
diff -Naurp slim.old/debian/po/es.po slim/debian/po/es.po
--- slim.old/debian/po/es.po	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/po/es.po	2010-07-07 19:19:11.140041650 +0000
@@ -94,4 +94,3 @@ msgstr "Varios gestores de sesiones se p
 #~ "sesión X que gestione será destruida. Puede dejar que xdm siga "
 #~ "ejecutándose, y la siguiente versión tendrá efecto cuando el demonio se "
 #~ "rearranque."
-
diff -Naurp slim.old/debian/po/pt_BR.po slim/debian/po/pt_BR.po
--- slim.old/debian/po/pt_BR.po	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/po/pt_BR.po	2010-07-07 19:19:11.132032251 +0000
@@ -1,4 +1,4 @@
-# Brazilian Portuguese translation (xdm) 
+# Brazilian Portuguese translation (xdm)
 # debconf templates for xdm package
 #
 # $Id: pt_BR.po 1042 2006-01-09 07:55:08Z ender $
diff -Naurp slim.old/debian/po/tr.po slim/debian/po/tr.po
--- slim.old/debian/po/tr.po	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/po/tr.po	2010-07-07 19:19:11.145023010 +0000
@@ -90,4 +90,3 @@ msgstr "Eğer farklı sunucuları çalı
 #~ "oturumları da sonlandırılacaktır.  Böyle yapmak yerine xdm'i çalışır "
 #~ "vaziyette bırakabilirsiniz.  Yeni sürüm, xdm servisinin bir sonraki "
 #~ "çalıştırılışında etkin olacaktır."
-
diff -Naurp slim.old/debian/po/vi.po slim/debian/po/vi.po
--- slim.old/debian/po/vi.po	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/po/vi.po	2010-07-07 19:19:11.140041650 +0000
@@ -2,14 +2,14 @@
 # Vietnamese translation
 # slim 1.2.6-2
 # $Id: vi.po 1042 2006-01-09 07:55:08Z ender $
-# 
+#
 # Copyright:
 # Branden Robinson, 2000-2004
 # Clytie Siddall <cly...@riverland.net.au>, 2005-2007.
-# 
+#
 # This file is distributed under the same license as the xorg-x11 package.
 # Please see debian/copyright.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.3.0.dfsg.1-7+SVN\n"
diff -Naurp slim.old/debian/rules slim/debian/rules
--- slim.old/debian/rules	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/rules	2010-07-07 19:19:11.104019958 +0000
@@ -49,7 +49,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installdebconf	
+	dh_installdebconf
 	dh_installlogrotate
 	dh_installinit --no-restart-on-upgrade --no-start --update-rcd-params="start 99 2 3 4 5 . stop 1 0 1 6 ."
 	dh_installman
diff -Naurp slim.old/debian/slim.config slim/debian/slim.config
--- slim.old/debian/slim.config	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/slim.config	2010-07-07 19:19:11.056022374 +0000
@@ -65,4 +65,3 @@ if [ -n "$NEW_DEFAULT" ]; then
     fi
   fi
 fi
-
diff -Naurp slim.old/debian/slim.init slim/debian/slim.init
--- slim.old/debian/slim.init	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/slim.init	2010-07-07 19:19:11.056022374 +0000
@@ -76,4 +76,3 @@ case $1 in
 esac
 
 # End of file
-
diff -Naurp slim.old/debian/slim.postinst slim/debian/slim.postinst
--- slim.old/debian/slim.postinst	2010-07-07 19:19:28.000000000 +0000
+++ slim/debian/slim.postinst	2010-07-07 19:19:11.056022374 +0000
@@ -34,4 +34,3 @@ fi
 db_stop
 
 ##DEBHELPER##
-

Reply via email to