Merge lp:~ahasenack/landscape-client/client-package-lintian-fixes into lp:~landscape/landscape-client/trunk

[Andreas Hasenack]

This branch makes some changes to debian/* in an attempt to address some lintian warnings and errors in the packaging of landscape-client.

Notable changes:
- standard-version bumped to 3.8.2, the one in lucid. Also added a lintian override about it
- added dynamic dependency ${shlibs:Depends) to -common and -client so they grab the libc6 dependency automatically, and the required debian/rules change to generate those
- stripped binaries
- changed ${Source-Version} to ${binary:Version} in Depends as the former is deprecated
- changed _Choices to __Choices in the -common template which helps translators. Instead of having to translate the whole line, they can now translate each selection (between commas) independently
- added dummy build-arch and build-indep debian/rules targets
- uncommented dh_lintian in debian/rules, since all supported distros now have it. It's a noop for now, because we don't have lintian overrides for the binary packages yet, but might in the future
- added a lintian override for our usage of dh_python, which is not obsolete in lucid for example
- added some other lintian overrides, with comments explaining the reasoning
- added an explicit debian/source/format file, with "3.0 (quilt)", effectively making this a non-native package.
- removed some old makefile targets
- added new makefile targets to build a binary package, a source package and a so called "orig" tarball, which doesn't have the debian/ directory.

To run a source build with lintian output, type:

make sourcepackage

To make a binary build, use:

make package

To use your key to sign the build instead of the one from the changelog entry, set the DEBUILD_OPTS makefile variable like this:

make <something> <email address hidden>"

For example:

make sourcepackage <email address hidden>"

To just get the orig tarball in the parent directory:

make origtarball

All the above commands will build a source package, binary package or origtarball, respectively, with:
- all local uncommitted changes
- a debian/changelog entry with a version of XX.YY+bzr<revno>-0ubuntu0 (not in the case of the origtarball, which doesn't have debian/*)
- XX.YY+bzr<revno> UPSTREAM_VERSION set in landscape/__init__.py

[Jerry Seutter (jseutter)]

Builds as advertised, seems okay to my limited understanding of packaging. +1

review: Approve

[lp:~ahasenack/landscape-client/client-package-lintian-fixes]

585. By Andreas Hasenack on 2012-05-29

Reconciled with trunk

[Free Ekanayaka (free.ekanayaka)]

It looks good to me, +1.

review: Approve

[Alberto Donato (ack)]

Looks good! +1

review: Approve

[Free Ekanayaka (free.ekanayaka)]

After talking with Andreas on IRC, we came up with this plan:

1) we'll have a Makefile target that does builds an .orig.tar.gz tarball with the content of trunk, minus debian/ and with landscape/__init__.py sed'ed as appropriate

2) to prepare the branch for uploading to Ubuntu we use bzr merge-upstream passing the resulting .dsc, merge-upstream should handle the orig.tar.gz appropriately

3) to prepare development build we'll use XX.YY+bzr<REV> as versioning schema

review: Needs Fixing

[lp:~ahasenack/landscape-client/client-package-lintian-fixes]

586. By Andreas Hasenack on 2012-05-30

Change source format back to non-native

587. By Andreas Hasenack on 2012-05-30

Drop old deploy makefile target, no longer used

588. By Andreas Hasenack on 2012-05-30

Drop checkcertificate makefile target, no longer needed

589. By Andreas Hasenack on 2012-05-30

Get tarball version from changelog and append bzr revno

590. By Andreas Hasenack on 2012-05-30

Update version in __init__.py when making the tarball

591. By Andreas Hasenack on 2012-05-30

First attempt at package building from makefile

592. By Andreas Hasenack on 2012-05-30

Deal with changelog

593. By Andreas Hasenack on 2012-05-30

Run clean before tarring up things

594. By Andreas Hasenack on 2012-05-30

Don't rebuild manpages for the tarball for now

595. By Andreas Hasenack on 2012-05-30

Fix (hopefully) double +bzr in version

596. By Andreas Hasenack on 2012-05-30

- revert previous fix, was bogus
- don't do bzr revert

597. By Andreas Hasenack on 2012-05-30

Oh, got it, thanks to ruda on irc. Use := instead of =, and read up on variable recursive expansion that make does

598. By Andreas Hasenack on 2012-05-30

Added a comment about :=, and used it a few more times

599. By Andreas Hasenack on 2012-05-30

- move prepchangelog to the package targets
- export uncommitted changes too

600. By Andreas Hasenack on 2012-05-30

Also update version in the local __init__.py, not just the one in the
orig tarball. I'm just sure yet if I'm doing it in the best makefile
target.

601. By Andreas Hasenack on 2012-05-30

Sed the __init__.py file in the right place

602. By Andreas Hasenack on 2012-05-30

Take upstream version from landscape/__init__.py as authoritative
instead of the changelog one.

[Andreas Hasenack (ahasenack)]

Ok, this took longer than expected, but I think I have made the plan work. I'll update the initial description now.

[lp:~ahasenack/landscape-client/client-package-lintian-fixes]

603. By Andreas Hasenack on 2012-05-30

Added comment about the usage of --uncommitted

604. By Andreas Hasenack on 2012-05-30

More comments

605. By Andreas Hasenack on 2012-05-31

Added makefile variable which can be used to pass command-line options
to debuild, such as the gpg signing key to use.

[Free Ekanayaka (free.ekanayaka)]

Nice work, +1!

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-03-07 19:15:02 +0000
+++ Makefile	2012-05-31 00:35:24 +0000
@@ -3,6 +3,19 @@
 PYTHON ?= python
 TRIAL_ARGS ?= 
 TEST_COMMAND = trial $(TRIAL_ARGS) landscape
+UBUNTU_RELEASE := $(shell lsb_release -cs)
+# version in the code is authoritative
+# Use := here, not =, it's really important, otherwise UPSTREAM_VERSION
+# will be updated behind your back with the current result of that
+# command everytime it is mentioned/used.
+UPSTREAM_VERSION := $(shell python -c "from landscape import UPSTREAM_VERSION; print UPSTREAM_VERSION")
+CHANGELOG_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -f 2 -d " " | cut -f 1 -d '-')
+BZR_REVNO := $(shell bzr revno)
+ifeq (+bzr,$(findstring +bzr,$(UPSTREAM_VERSION)))
+TARBALL_VERSION := $(UPSTREAM_VERSION)
+else
+TARBALL_VERSION := $(UPSTREAM_VERSION)+bzr$(BZR_REVNO)
+endif
 
 all: build
 
@@ -28,9 +41,6 @@
 pyflakes:
 	-pyflakes `find landscape -name \*py|grep -v twisted_amp\.py|grep -v configobj\.py|grep -v mocker\.py`
 
-checkcertificate:
-	-echo | openssl s_client -connect landscape.canonical.com:443 -CAfile /etc/ssl/certs/ca-certificates.crt
-
 clean:
 	-find landscape -name \*.pyc -exec rm {} \;
 	-rm tags
@@ -52,26 +62,32 @@
 	${TXT2MAN} -P Landscape -s 1 -t landscape-config < man/landscape-config.txt > man/landscape-config.1
 	${TXT2MAN} -P Landscape -s 1 -t landscape-message < man/landscape-message.txt > man/landscape-message.1
 
-package: manpages
-	@fakeroot debian/rules binary
-	@echo "\n\nYou remembered to update the changelog, right?\n\n"
+origtarball: sdist
+	cp -f sdist/landscape-client-$(TARBALL_VERSION).tar.gz \
+		../landscape-client_$(TARBALL_VERSION).orig.tar.gz
 
-SSH_USERNAME=`whoami`
-SSH_HOST=people.ubuntu.com
-PACKAGE_DIR=/home/jkakar/public_html/landscape
-deploy:
-ifneq (${PACKAGE},)
-	@echo "Copying ${PACKAGE} to $(SSH_HOST):$(PACKAGE_DIR)"
-	@scp ${PACKAGE} $(SSH_USERNAME)@$(SSH_HOST):$(PACKAGE_DIR)
-	@echo "\nScanning packages and recreating the Packages file."
-	@ssh -l $(SSH_USERNAME) $(SSH_HOST) \
-		"cd $(PACKAGE_DIR) " \
-		"&& dpkg-scanpackages . /dev/null > Packages " \
-		"&& gzip -f Packages"
+prepchangelog:
+# add a temporary entry for a local build if needed
+ifeq (,$(findstring +bzr,$(CHANGELOG_VERSION)))
+	dch -v $(TARBALL_VERSION)-0ubuntu0 "New local test build" --distribution $(UBUNTU_RELEASE)
 else
-	@echo "You need to specify PACKAGE, as in: make deploy PACKAGE=<name>"
+# just update the timestamp
+	dch --distribution $(UBUNTU_RELEASE) --release $(UBUNTU_RELEASE)
 endif
 
+updateversion:
+	sed -i -e "s/^UPSTREAM_VERSION.*/UPSTREAM_VERSION = \"$(TARBALL_VERSION)\"/g" \
+		landscape/__init__.py
+
+package: clean prepchangelog updateversion
+	debuild -b $(DEBUILD_OPTS)
+
+sourcepackage: clean origtarball prepchangelog updateversion
+	# need to remove sdist here because it doesn't exist in the
+	# orig tarball
+	rm -rf sdist
+	debuild -S $(DEBUILD_OPTS)
+
 MESSAGE_DIR = `pwd`/runclient-messages
 LOG_FILE = `pwd`/runclient.log
 
@@ -101,13 +117,16 @@
 etags:
 	-etags --languages=python -R .
 
-UPSTREAM_VERSION=$(shell python -c "from landscape import UPSTREAM_VERSION; print UPSTREAM_VERSION")
-sdist:
+sdist: clean
 	mkdir -p sdist
-	bzr export sdist/landscape-client-$(UPSTREAM_VERSION)
-	rm -rf sdist/landscape-client-$(UPSTREAM_VERSION)/debian
-	cd sdist && tar cfz landscape-client-$(UPSTREAM_VERSION).tar.gz landscape-client-$(UPSTREAM_VERSION)
-	cd sdist && md5sum landscape-client-$(UPSTREAM_VERSION).tar.gz > landscape-client-$(UPSTREAM_VERSION).tar.gz.md5
-	rm -rf sdist/landscape-client-$(UPSTREAM_VERSION)
+	# --uncommitted because we want any changes the developer might have made
+	# locally to be included in the package without having to commit
+	bzr export --uncommitted sdist/landscape-client-$(TARBALL_VERSION)
+	rm -rf sdist/landscape-client-$(TARBALL_VERSION)/debian
+	sed -i -e "s/^UPSTREAM_VERSION.*/UPSTREAM_VERSION = \"$(TARBALL_VERSION)\"/g" \
+		sdist/landscape-client-$(TARBALL_VERSION)/landscape/__init__.py
+	cd sdist && tar cfz landscape-client-$(TARBALL_VERSION).tar.gz landscape-client-$(TARBALL_VERSION)
+	cd sdist && md5sum landscape-client-$(TARBALL_VERSION).tar.gz > landscape-client-$(TARBALL_VERSION).tar.gz.md5
+	rm -rf sdist/landscape-client-$(TARBALL_VERSION)
 
 .PHONY: tags etags

=== modified file 'debian/control'
--- debian/control	2012-03-30 12:24:31 +0000
+++ debian/control	2012-05-31 00:35:24 +0000
@@ -4,12 +4,13 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Landscape Team <[e-mail]>
 Build-Depends: debhelper (>= 5), po-debconf, python-dev, python-central | python-support, lsb-release, gawk, python-twisted-core, python-distutils-extra
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 XS-Python-Version: >= 2.4, << 2.8
 
 Package: landscape-common
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         ${shlibs:Depends},
          python-gnupginterface,
          python-twisted-core,
          python-apt,
@@ -33,9 +34,10 @@
 Package: landscape-client
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         ${shlibs:Depends},
          python-twisted-web,
          python-twisted-names,
-         landscape-common (= ${Source-Version})
+         landscape-common (= ${binary:Version})
 Suggests: ${extra:Suggests}
 Description: The Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This
@@ -48,8 +50,8 @@
 Package: landscape-client-ui
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends},
-         landscape-client (= ${Source-Version}),
-         landscape-client-ui-install (= ${Source-Version}),
+         landscape-client (= ${binary:Version}),
+         landscape-client-ui-install (= ${binary:Version}),
          python-gi,
          python-dbus,
          policykit-1,

=== modified file 'debian/landscape-client.templates'
--- debian/landscape-client.templates	2012-05-10 17:56:04 +0000
+++ debian/landscape-client.templates	2012-05-31 00:35:24 +0000
@@ -64,7 +64,7 @@
 Template: landscape-client/tags
 Type: string
 Default:
-_Description: Initial tags for first registration
+_Description: Initial tags for first registration:
  Comma separated list of tags which will be assigned to this computer on its
  first registration.  Once the machine is registered, these tags can only be
  changed using the Landscape server.

=== modified file 'debian/landscape-common.templates'
--- debian/landscape-common.templates	2008-09-10 21:03:34 +0000
+++ debian/landscape-common.templates	2012-05-31 00:35:24 +0000
@@ -6,7 +6,7 @@
 # try to keep below ~71 characters.
 # DO NOT USE commas (,) in Choices translations otherwise
 # this will break the choices shown to users
-_Choices: Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on every login
+__Choices: Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on every login
 Default: Cache sysinfo in /etc/motd
 _Description: landscape-sysinfo configuration:
  Landscape includes a tool and a set of modules that can display

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2012-05-10 14:47:07 +0000
+++ debian/po/templates.pot	2012-05-31 00:35:24 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: landscape-client\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-07 17:07+0100\n"
+"POT-Creation-Date: 2012-05-28 16:40-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -55,8 +55,8 @@
 #. Description
 #: ../landscape-client.templates:3001
 msgid ""
-"Client registration key for the given Landscape account.  Only needed "
-"if the given account is requesting a client registration key."
+"Client registration key for the given Landscape account.  Only needed if the "
+"given account is requesting a client registration key."
 msgstr ""
 
 #. Type: string
@@ -152,7 +152,7 @@
 #. Type: string
 #. Description
 #: ../landscape-client.templates:11001
-msgid "Initial tags for first registration"
+msgid "Initial tags for first registration:"
 msgstr ""
 
 #. Type: string
@@ -187,9 +187,31 @@
 #. DO NOT USE commas (,) in Choices translations otherwise
 #. this will break the choices shown to users
 #: ../landscape-common.templates:1001
-msgid ""
-"Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on "
-"every login"
+msgid "Do not display sysinfo on login"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators beware! the following three strings form a single
+#. Choices menu. - Every one of these strings has to fit in a standard
+#. 80 characters console, as the fancy screen setup takes up some space
+#. try to keep below ~71 characters.
+#. DO NOT USE commas (,) in Choices translations otherwise
+#. this will break the choices shown to users
+#: ../landscape-common.templates:1001
+msgid "Cache sysinfo in /etc/motd"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators beware! the following three strings form a single
+#. Choices menu. - Every one of these strings has to fit in a standard
+#. 80 characters console, as the fancy screen setup takes up some space
+#. try to keep below ~71 characters.
+#. DO NOT USE commas (,) in Choices translations otherwise
+#. this will break the choices shown to users
+#: ../landscape-common.templates:1001
+msgid "Run sysinfo on every login"
 msgstr ""
 
 #. Type: select

=== modified file 'debian/rules'
--- debian/rules	2012-05-25 20:13:38 +0000
+++ debian/rules	2012-05-31 00:35:24 +0000
@@ -30,6 +30,10 @@
 landscape_common_substvars = debian/landscape-common.substvars
 landscape_client_substvars = debian/landscape-client.substvars
 
+build-arch: build
+
+build-indep: build
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -69,10 +73,7 @@
 # do nothing
 #
 binary-arch: build install
-	# That's not present in Ubuntu releases we still support, so
-	# we're just installing the lintian overrides file by hand
-	# for now.
-	#dh_lintian
+	dh_lintian
 	dh_testdir
 	dh_testroot
 	dh_installdocs
@@ -82,8 +83,10 @@
 	dh_installinit -- start 45 2 3 4 5 . stop 15 0 1 6 .
 	dh_installlogrotate
 	dh_installdebconf
+	dh_strip
 	dh_compress
 	dh_fixperms
+	dh_shlibdeps
 
 ifneq (,$(findstring $(dist_release),hardy))
 	# We depend on bug-fixed versions of python-dbus and pycurl on hardy

=== added directory 'debian/source'
=== added file 'debian/source.lintian-overrides'
--- debian/source.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/source.lintian-overrides	2012-05-31 00:35:24 +0000
@@ -0,0 +1,15 @@
+# we use dh_python or dh_python2 depending on the ubuntu release
+# the package is being built on, this is detected dynamically
+# in the rules file
+landscape-client source: dh_python-is-obsolete
+
+# the package has to build on lucid, where the standards version
+# is 3.8.2
+landscape-client source: ancient-standards-version
+
+# it's a bug that should be fixed in quantal
+landscape-client source: unknown-field-in-dsc original-maintainer
+
+# this is only used in a very specific client upgrade from
+# the dbus to the amp version
+landscape-client: start-stop-daemon-in-maintainer-script postinst:130

=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-05-31 00:35:24 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)