[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-session][debian/master] 4 commits: Trim trailing whitespace.

Yves-Alexis Perez gitlab at salsa.debian.org
Fri Jan 17 06:56:00 GMT 2020



Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / xfce4-session


Commits:
85fe399e by Debian Janitor at 2020-01-17T01:19:28+00:00
Trim trailing whitespace.

Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html

- - - - -
58fe1108 by Debian Janitor at 2020-01-17T01:19:52+00:00
Use set -e rather than passing -e on the shebang-line.

Fixes: lintian: maintainer-script-without-set-e
See-also: https://lintian.debian.org/tags/maintainer-script-without-set-e.html

- - - - -
72ee7fde by Debian Janitor at 2020-01-17T01:20:17+00:00
Set upstream metadata fields: Name (from ./configure), Repository.

Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html

- - - - -
b96e0172 by Yves-Alexis Perez at 2020-01-17T06:55:58+00:00
Merge branch 'lintian-fixes' into 'debian/master'

Fix some issues reported by lintian

See merge request xfce-team/desktop/xfce4-session!1
- - - - -


4 changed files:

- debian/changelog
- debian/postinst
- debian/prerm
- + debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+xfce4-session (4.14.1-2) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use set -e rather than passing -e on the shebang-line.
+  * Set upstream metadata fields: Name (from ./configure), Repository.
+
+ -- Debian Janitor <janitor at jelmer.uk>  Fri, 17 Jan 2020 01:19:18 +0000
+
 xfce4-session (4.14.1-1) unstable; urgency=medium
 
   [ Unit 193 ]
@@ -75,7 +83,7 @@ xfce4-session (4.12.1-6) unstable; urgency=medium
     - migrate to dbgsym packages.
     - refactor dh_install override si we now have only one binary package.
   * debian/xfce4-session.install: remove stuff now already present in
-    debian/xfce4-session at build time. 
+    debian/xfce4-session at build time.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 21 Oct 2017 14:39:23 +0200
 
@@ -141,7 +149,7 @@ xfce4-session (4.12.0-1) experimental; urgency=medium
   * debian/rules:
     - call dh-autoreconf to refresh config.{guess,sub}.
   * debian/xfce4-session.lintian-overrides
-    - add override for the DesktopNames key in /u/s/xsessions/xfce.desktop. 
+    - add override for the DesktopNames key in /u/s/xsessions/xfce.desktop.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 08 Mar 2015 20:38:32 +0100
 
@@ -414,7 +422,7 @@ xfce4-session (4.8.3-1) unstable; urgency=low
 xfce4-session (4.8.2-3) unstable; urgency=low
 
   * debian/prerm:
-    - don't remove the x-session-manager alternative on upgrades. 
+    - don't remove the x-session-manager alternative on upgrades.
                                                                 closes: #653834
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 02 Jan 2012 07:57:30 +0100
@@ -438,11 +446,11 @@ xfce4-session (4.8.2-2) unstable; urgency=low
 xfce4-session (4.8.2-1) unstable; urgency=low
 
   * New upstream release.
-  * debian/patches: 
+  * debian/patches:
     - 01_correct_shadows, dropped, we don't show splash screen by default
       anymore anyway.s
     - 03_dont-die-on-dbus-disconnect dropped, included upstream.
-    - 02_fix-fortune-path, 04_fix-missing-lm and 
+    - 02_fix-fortune-path, 04_fix-missing-lm and
       05_force-xfsettingsd-start refreshed.
   * debian/rules, debian/preinst, debian/postinst, debian/postrm:
     - don't start tips by default, they're completely outdated. closes: #640984
@@ -476,7 +484,7 @@ xfce4-session (4.8.1-3) unstable; urgency=low
 
 xfce4-session (4.8.1-2) unstable; urgency=low
 
-  * Upload to unstable. 
+  * Upload to unstable.
   * debian/control:
     - drop Emanuele and Simon from Uploaders, thanks to them.
     - update standards version to 3.9.2.
@@ -493,7 +501,7 @@ xfce4-session (4.8.1-1) experimental; urgency=low
   * New upstream release.
   * debian/patches:
     - 02_fix-fortune-path refreshed.
-    - 04_gk-dont-check-running-use-start refreshed. 
+    - 04_gk-dont-check-running-use-start refreshed.
   * debian/control:
     - refresh build-deps for Xfce 4.7.
     - add build-dep on hardening-includes.
@@ -565,7 +573,7 @@ xfce4-session (4.6.2-1) unstable; urgency=low
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
     - drop quilt rules.
-    - switch to debhelper 7 tiny rules. 
+    - switch to debhelper 7 tiny rules.
     - make intltool ignore c files in .pc quilt dir.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 May 2010 13:55:01 +0200
@@ -601,7 +609,7 @@ xfce4-session (4.6.0-1) experimental; urgency=low
     - update build deps for Xfce 4.6 alpha.
     - update standards version to 3.8.0.
     - replace recommends on xbase-clients by x11-xserver-utils.
-    - swap calls to dh_makeshlibs and dh_installdeb. 
+    - swap calls to dh_makeshlibs and dh_installdeb.
     - remove dep on xfce4-mcs-manager and replace it by xfconf,
       xfce4-settings.
     - explicitely add build-dep on libdbus-glib-1-dev.
@@ -618,7 +626,7 @@ xfce4-session (4.6.0-1) experimental; urgency=low
   * debian/patches:
     - 02_use-mice-as-default-engine dropped.
     - 07_parallel-startup removed, included upstream.
-    - other patches reordered. 
+    - other patches reordered.
   * debian/xfce4-session.xml:
     - ship a xfconf config file for selecting the simple engine, put it in
       desktop-base dirs until we can ship it in desktop-base package.
@@ -676,7 +684,7 @@ xfce4-session (4.4.2-5) unstable; urgency=low
 
   * switch to triggers:
     - debian/{postinst,prerm} dropped.
-    - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager. 
+    - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager.
   * debian/control:
     - remove Conflicts/Replaces: xfce4-toys, since it's not in Etch.
     - drop Martin Loschwitz from Uploaders.
@@ -707,8 +715,8 @@ xfce4-session (4.4.2-2) unstable; urgency=low
     - updated my email address.
     - add dependency on xfce4-mcs-manager because of settings plugins calling
       xfce-setting-show
-  * debian/lintian: 
-    - override "desktop-command-not-in-package" for xfce-setting-show now we 
+  * debian/lintian:
+    - override "desktop-command-not-in-package" for xfce-setting-show now we
       depend on it.
     - edit overrides for "binary-without-manpage", using complete path.
   * debian/copyright: use © sign.
@@ -754,7 +762,7 @@ xfce4-session (4.4.1-1) unstable; urgency=low
  -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
 
 xfce4-session (4.4.0-1) experimental; urgency=low
-  
+
   (Yves-Alexis Perez)
   * New upstream release.
   * debian/control: updated build-deps against Xfce 4.4.
@@ -802,11 +810,11 @@ xfce4-session (4.3.99.1-1) unstable; urgency=low
  -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 23 Sep 2006 13:42:51 +0100
 
 xfce4-session (4.3.90.2-1) unstable; urgency=low
-  
+
   (Yves-Alexis Perez)
   * New upstream release.
   * debian/postinst: fixed install on hurd by not using pkill.
-  * debian/control: updated standards version to 3.7.2. 
+  * debian/control: updated standards version to 3.7.2.
   (Simon Huggins)
   * Add rpath fixes.
 
@@ -814,14 +822,14 @@ xfce4-session (4.3.90.2-1) unstable; urgency=low
 
 xfce4-session (4.3.90.1-1) unstable; urgency=low
 
-  (Yves-Alexis Perez) 
+  (Yves-Alexis Perez)
    * New Upstream Release
   (Simon Huggins)
    * Remove all pointless .la files
    * Depend on fortune-mod for xfce4-tips
-  
+
  -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 03 May 2006 18:35:05 +0100
- 
+
 xfce4-session (4.2.3-1) unstable; urgency=low
 
   * New Upstream Release
@@ -932,4 +940,3 @@ xfce4-session (0.1.3+20030922-1) unstable; urgency=low
   * Initial Package.
 
  -- Oliver M. Bolzer <oliver at debian.org>  Tue,  9 Dec 2003 09:40:42 +0100
-


=====================================
debian/postinst
=====================================
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = configure ]; then
   update-alternatives --install /usr/bin/x-session-manager \


=====================================
debian/prerm
=====================================
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = "remove" ]; then
   update-alternatives --remove x-session-manager /usr/bin/xfce4-session 


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,2 @@
+Name: xfce4-session
+Repository: git://git.xfce.org/xfce/xfce4-session



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/compare/53ad45db05680d204d90260f8886ab8d3cede83f...b96e0172af2d3ffd1ce0956a85f3df229d2ba886

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/compare/53ad45db05680d204d90260f8886ab8d3cede83f...b96e0172af2d3ffd1ce0956a85f3df229d2ba886
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20200117/052c6156/attachment-0001.html>


More information about the Pkg-xfce-commits mailing list