customized debian/ and debian packaging script to support ubuntu ppas

packaging/build_deb.sh

@@ -1,15 +1,15 @@
 #!/bin/sh
 
-cd `dirname "$0"`/..
+set -e
-mkdir -p dist
-DIST="$PWD/dist"
-DEBIAN="$PWD/packaging/debian"
-RULES_D="$PWD/rules.d"
 
-BUILD_DIR="${TMPDIR:-/tmp}/$PWD"
+cd `dirname "$0"`/..
+DEBIAN_FILES="$PWD/packaging/debian"
+DIST="$PWD/dist/${DISTRIBUTION:=debian}"
+
+BUILD_DIR="${TMPDIR:-/tmp}/$DIST"
+rm -rf "$BUILD_DIR"
 mkdir -m 0700 -p "$BUILD_DIR"
-rm -rf "$BUILD_DIR"/*
+python "setup.py" sdist --dist-dir="$BUILD_DIR" --formats=gztar
-python setup.py sdist --dist-dir="$BUILD_DIR"
 
 cd "$BUILD_DIR"
 S=`ls -1 solaar-*.tar.gz`
@@ -18,13 +18,15 @@ VERSION=${VERSION%.tar.gz}
 tar xfz "$S"
 mv "$S" solaar_$VERSION.orig.tar.gz
 
-cd solaar-*
+cd solaar-$VERSION
-cp -a "$DEBIAN" .
+cp -a "$DEBIAN_FILES" .
-ls -1 "$RULES_D"/*.rules | while read rule; do
+
-	target=`basename "$rule"`
+test -n "$DEBIAN_FILES_EXTRA" && cp -a $DEBIAN_FILES_EXTRA/* debian/
-	target=${target#??-}
+# test -d debian/patches && ls -1 debian/patches/*.diff | cut -d / -f 3 > debian/patches/series
-	target=${target%.rules}
+
-	cp -av "$rule" ./debian/solaar.$target.udev
+debuild ${DEBUILD_ARGS:-$@}
-done
+
-debuild "$@"
+rm -rf "$DIST"
-cp -au ../solaar_* "$DIST"
+mkdir -p "$DIST"
+cp -a ../solaar_$VERSION* "$DIST"
+cd "$DIST"

packaging/build_ppa.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+cd `dirname "$0"`/..
+
+. "$HOME/.devscripts"
+
+DEBIAN_CHANGELOG=$PWD/packaging/debian/changelog
+PPA_CHANGELOG=$PWD/packaging/ubuntu/changelog
+
+latest=`head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#'`
+cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG
+$latest
+
+  * Customized debian/ for ubuntu launchpad ppa.
+
+ -- $DEBFULLNAME <$DEBMAIL>  $(date -R)
+
+_CHANGELOG
+
+DISTRIBUTION=ubuntu
+DEBIAN_FILES_EXTRA=$PWD/packaging/ubuntu
+DEBUILD_ARGS="-S"
+. packaging/build_deb.sh
+
+rm -f "$PPA_CHANGELOG"
+
+#dput solaar-ppa solaar_*_source.changes

packaging/debian/changelog

@@ -1,4 +1,10 @@
-solaar (0.8.5-3) UNRELEASED; urgency=low
+solaar (0.8.5.1-4) UNRELEASED; urgency=low
+
+  * Customized debian/rules to support extensions.
+
+ -- Daniel Pavel <daniel.pavel@gmail.com>  Sat, 07 Jan 2013 11:15:00 +0200
+
+solaar (0.8.5.1-3) UNRELEASED; urgency=low
 
   * Fixed desktop file icon.
   * Fixed X-Python-Version.

packaging/debian/control

@@ -15,7 +15,7 @@ Package: solaar
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, udev, python-pyudev (>= 0.13), python-gi (>= 3.2), gir1.2-gtk-3.0 (>= 3.4)
 Suggests: gir1.2-notify-0.7
-Description: Logitech Unifying Receiver peripherals manager for Linux.
+Description: Logitech Unifying Receiver peripherals manager for Linux
  Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals.
  It is able to pair/unpair devices to the receiver, and for some devices read
  battery status.

packaging/debian/rules

@@ -3,19 +3,18 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+#export DH_OPTIONS=-v
+
+PREFIX = /usr
+-include debian/rules.extra
 
 %:
 	# Adding the required helpers
 	dh $@ --with=python2
 
-# override_dh_auto_clean:
-# 	dh_auto_clean
-# 	rm -rf build/
-
 override_dh_auto_install:
-	python setup.py install --root=debian/solaar --install-layout=deb --install-lib=/usr/share/solaar/lib
+	dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib
-
-override_dh_auto_build:
 
 override_dh_installudev:
+	cp rules.d/??-logitech-unifying-receiver.rules debian/solaar.logitech-unifying-receiver.udev
 	dh_installudev --priority=99 --name=logitech-unifying-receiver

packaging/debian/rules.extra

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

packaging/ubuntu/rules.extra

@@ -0,0 +1,9 @@
+# this file is included by debian/rules
+
+PREFIX = /opt/extras.ubuntu.com/solaar
+
+# hacky...
+override_dh_link:
+	dh_link
+	sed -i -e 's#Icon=solaar.png#Icon=/opt/extras.ubuntu.com/solaar/share/icons/solaar.png#' \
+		debian/solaar/opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop

packaging/ubuntu/solaar.links

@@ -0,0 +1 @@
+opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop usr/share/applications/extras-solaar.desktop

packaging/upload_ppa.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd `dirname "$0"`/..
-./packaging/build_deb.sh -S "$@"
-
-cd dist
-sed -e 's/UNRELEASED/precise/g' -i solaar_*_source.changes
-debsign --re-sign solaar_*_source.changes
-dput -f solaar-ppa solaar_*_source.changes
-