Various packaging fixes, thanks to Christian Kastner for reviewing

6 files changed, 31 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index e8e7921..d19714f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,15 +6,15 @@ lightdm-gtk-greeter-settings (1.2.0-1) unstable; urgency=medium
     - Write a manpage (lightdm-gtk-greeter-settings.1), dropping
       the binary-without-manpage lintian override
       for /usr/bin/lightdm-gtk-greeter-settings.
-    - Add a get-orig-source target for debian/rules.
     - Set myself as maintainer.
     - Set package source/format to 3.0 quilt.
-    - debian/links: symlink the root NEWS file as an upstream changelog.
+    - links: symlink the root NEWS file as an upstream changelog.
       This fixes the no-upstream-changelog Lintian pedantic warning.
-    - debian/rules: override dh_auto_clean to remove
+    - rules: override dh_auto_clean to remove
       po/lightdm-gtk-greeter-settings.pot, so that successive builds work.
+    - control: add dependency on gir1.2-pango-1.0
 
- -- James Lu <glolol1@hotmail.com>  Fri, 26 Jun 2015 15:45:02 -0700
+ -- James Lu <bitflip3@gmail.com>  Sat, 10 Oct 2015 22:20:50 -0700
 
 lightdm-gtk-greeter-settings (1.2.0-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/control b/debian/control
index ccdf45f..4660cd1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,27 @@
 Source: lightdm-gtk-greeter-settings
 Section: utils
 Priority: optional
-Maintainer: James Lu <glolol1@hotmail.com>
-Build-Depends: debhelper (>= 9), python3, 
+Maintainer: James Lu <bitflip3@gmail.com>
+Build-Depends: debhelper (>= 9), python3,
  python3-distutils-extra (>= 2.18), python-gi-dev
 X-Python3-Version: >= 3.0
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/lightdm-gtk-greeter-settings
 Vcs-Git: git://anonscm.debian.org/collab-maint/lightdm-gtk-greeter-settings.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/lightdm-gtk-greeter-settings.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/lightdm-gtk-greeter-settings.git/
 
 Package: lightdm-gtk-greeter-settings
 Architecture: all
-Depends: ${python3:Depends}, 
+Depends: ${python3:Depends},
          ${misc:Depends},
          python3-gi (>= 3.0),
          gir1.2-gtk-3.0,
          gir1.2-glib-2.0,
          gir1.2-gdkpixbuf-2.0,
-         lightdm-gtk-greeter
+         lightdm-gtk-greeter,
+         gir1.2-pango-1.0
 Recommends: policykit-1 | gksu
-Description: Settings editor for LightDM Gtk+ Greeter
- A simple configuration utility for the LightDM Gtk+ Greeter.
+Description: settings editor for the LightDM GTK+ Greeter
+ A simple configuration utility for the LightDM GTK+ Greeter.
  All configuration options available in the greeter are
  exposed and easily manipulated using this tool.
diff --git a/debian/copyright b/debian/copyright
index 381883d..1eb80da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,29 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lightdm-gtk-greeter-settings
-Upstream-Source: https://launchpad.net/lightdm-gtk-greeter-settings
+Source: https://launchpad.net/lightdm-gtk-greeter-settings
 
 Files: *
 Copyright: 2014, Andrew P. <pan.pav.7c5@gmail.com>
-License: GPL-3+
+License: GPL-3
 
 Files: debian/*
 Copyright: 2015, Sean Davis <bluesabre@ubuntu.com>
            2015, James Lu <glolol1@hotmail.com>
 License: GPL-3+
 
+License: GPL-3
+ 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, version 3.
+ .
+ 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, see <http://www.gnu.org/licenses/>.
+
 License: GPL-3+
  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
@@ -25,4 +38,4 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 X-Comment: On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3’.
+           Public License can be found in `/usr/share/common-licenses/GPL-3’.
diff --git a/debian/lightdm-gtk-greeter-settings.lintian-overrides b/debian/lightdm-gtk-greeter-settings.lintian-overrides
deleted file mode 100644
index acf4349..0000000
--- a/debian/lightdm-gtk-greeter-settings.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# There is already a manual page for the main lightdm-gtk-greeter-settings app, and many other *-pkexec binaries in Debian don't have manpages either.
-lightdm-gtk-greeter-settings: binary-without-manpage usr/bin/lightdm-gtk-greeter-settings-pkexec
diff --git a/debian/links b/debian/links
index 0ab7538..035e432 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,6 @@
 # Upstream installs their changelog as NEWS, not CHANGELOG
 # This squashes the no-upstream-changelog Lintian pedantic warning.
 usr/share/doc/lightdm-gtk-greeter-settings/NEWS.gz usr/share/doc/lightdm-gtk-greeter-settings/changelog.gz
+
+# Fixes binary-without-manpage warning for /usr/bin/lightdm-gtk-greeter-settings-pkexec
+usr/share/man/man8/lightdm-gtk-greeter-settings.8.gz usr/share/man/man8/lightdm-gtk-greeter-settings-pkexec.8.gz
diff --git a/debian/rules b/debian/rules
index 739a1db..6a57f1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,6 @@ export PYBUILD_INSTALL_ARGS=--xfce-integration
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-VER = $(shell dpkg-parsechangelog --show-field=Version | cut -d '-' -f 1)
-
-get-orig-source:
-	uscan --noconf --verbose --rename --destdir=$(CURDIR)/.. --check-dirname-level=0 --force-download --download-version $(VER)
-
 override_dh_auto_clean:
 	# Remove the auto-generated .pot file so successive builds work.
 	rm -f po/lightdm-gtk-greeter-settings.pot