debian packaging: cleaned-up the debian/ files

according to feedback on debian bug #715172
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715172)

packaging/README

@@ -1,5 +1,5 @@
-The debian/ and ubuntu/ folders are maintained by me and used for all releases
+The debian/ folder is maintained by me and used for all releases for Debian
-for those respective distros.
+and Ubuntu.
 
 The rest of the files serve as samples/guidelines for packaging Solaar.
 They may be out-of-date or simply wrong, and are not necessarily used to build

packaging/build_deb.sh

@@ -21,7 +21,9 @@ fi
 export DEBMAIL="$DEBEMAIL"
 
 export DEBCHANGE_VENDOR=${DEBCHANGE_VENDOR:-$(/usr/bin/dpkg-vendor --query vendor | /usr/bin/tr 'A-Z' 'a-z')}
+test "$DEBCHANGE_VENDOR"
 DISTRIBUTION=${DISTRIBUTION:-UNRELEASED}
+test "$DISTRIBUTION"
 
 cd "$(dirname "$0")/.."
 DEBIAN_FILES="$PWD/packaging/debian"
@@ -109,6 +111,13 @@ done
 # remove the templates, they are not relevant to the debian source package
 /bin/rm --force debian/substvars.*.*
 
+# apply custom substvars and clean-up debian/
+cat debian/substvars.* | /bin/grep '^[-A-Za-z]*=' | /usr/bin/tr '=' ' ' |\
+while read variable value; do
+	/bin/sed --in-place --expression="s/\${solaar:$variable}/$value/" debian/control
+done
+/bin/rm --force debian/substvars.*
+
 /usr/bin/debuild \
 	--lintian --tgz-check \
 	--preserve-envvar=DISPLAY \

packaging/debian/compat

@@ -1 +1 @@
-8
+9

packaging/debian/control

@@ -15,7 +15,7 @@ Package: solaar
 Architecture: all
 Depends: ${misc:Depends}, ${debconf:Depends}, udev (>= 175), passwd | adduser,
  ${python:Depends}, python-pyudev (>= 0.13), python-gi (>= 3.2), gir1.2-gtk-3.0 (>= 3.4),
- ${Desktop-Icon-Theme}
+ ${solaar:Desktop-Icon-Theme}
 Recommends: gir1.2-notify-0.7, consolekit (>= 0.4.3) | systemd (>= 44),
  python-dbus (>= 1.1.0), upower
 Suggests: gir1.2-appindicator3-0.1, solaar-gnome3 (= ${source:Version})
@@ -29,7 +29,7 @@ Architecture: all
 Section: gnome
 Depends: ${misc:Depends}, solaar (= ${source:Version}),
  gir1.2-appindicator3-0.1, gnome-shell (>= 3.4) | unity (>= 5.10),
- ${Gnome-Icon-Theme}
+ ${solaar:Gnome-Icon-Theme}
 Enhances: solaar
 Description: gnome-shell/Unity integration for Solaar
  Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals.

packaging/debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: Daniel Pavel <daniel.pavel@gmail.com>
 Upstream-Source: http://github.com/pwr/Solaar
 
 Files: *
-Copyright: Copyright (C) 2012-2013 Daniel Pavel
+Copyright: Copyright 2012-2013 Daniel Pavel
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 2 as
@@ -23,11 +23,35 @@ License: GPL-2
  version 2, can be found in /usr/share/common-licenses/GPL-2.
 
 Files: share/icons/solaar*.svg
-Copyright: Copyright (C) 2012-2013 Daniel Pavel
+Copyright: Copyright 2012-2013 Daniel Pavel
 License: LGPL
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
  .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Files: share/icons/light_*.png
 Copyright: Oxygen Icons
 License: LGPL
- These files were copied from the Oxygen icon theme (weather-*).
+Comment: These files were copied from the Oxygen icon theme (weather-*).
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.

packaging/debian/rules

@@ -6,7 +6,6 @@
 #export DH_OPTIONS=-v
 
 PREFIX = /usr
--include debian/rules.extra
 
 %:
 	# Adding the required helpers
@@ -16,7 +15,4 @@ override_dh_auto_install:
 	dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib
 
 override_dh_python2:
-	dh_python2 $(PREFIX)/share/solaar
+	dh_python2 $(PREFIX)/share/solaar/lib
-
-override_dh_gencontrol:
-	dh_gencontrol -- -Tdebian/substvars.theme

packaging/debian/rules.extra

@@ -1 +0,0 @@
-# this file is included by debian/rules

packaging/dput.cf

@@ -1,22 +1,22 @@
+[DEFAULT]
+progress_indicator = 2
+allow_unsigned_uploads = 0
+login = anonymous
+
 [solaar-ppa]
 fqdn = ppa.launchpad.net
-method = ftp
 incoming = ~daniel.pavel/solaar/ubuntu/
-login = anonymous
+method = ftp
-allow_unsigned_uploads = 0
+allowed_distributions = precise
 
 [solaar-snapshots-ppa]
 fqdn = ppa.launchpad.net
-method = ftp
 incoming = ~daniel.pavel/solaar-snapshots/ubuntu/
-login = anonymous
+method = ftp
-allow_unsigned_uploads = 0
+allowed_distributions = precise
 
 [mentors]
 fqdn = mentors.debian.net
 incoming = /upload
 method = http
-allow_unsigned_uploads = 0
+allowed_distributions = unstable
-progress_indicator = 2
-# Allow uploads for UNRELEASED packages
-allowed_distributions = .*