Commit c9fa0b2680210040fa74c25b28b88ec1beba90c3

Authored by Ben Finney
2 parents 941d3ab7 c1bc5d3d

Merge Debian packaging for release “0.7-2”.

debian/changelog
  1 +comixcursors (0.7-2) unstable; urgency=low
  2 +
  3 + * debian/patches/01-custom-destdir.patch:
  4 + + Use standard ‘DESTDIR’ variable for customising top-level install
  5 + directory.
  6 + * debian/control:
  7 + + Update Homepage to descriptive URL.
  8 + + Remove “Depends: ${shlibs:Depends}”, there are no executable files.
  9 + * debian/control, debian/rules, debian/*.install, debian/*.docs:
  10 + + Conform to “Standards-Version: 3.9.1”. No further changes needed.
  11 + + Install documentation.
  12 + + Split into multiple binary packages, aligned with upstream's
  13 + groupings (RH translucent, LH translucent, RH opaque, LH opaque).
  14 + * debian/preinst:
  15 + + Handle the case where no cursor themes are yet installed
  16 + (Closes: Bug#591595).
  17 +
  18 + -- Ben Finney <ben+debian@benfinney.id.au> Thu, 05 Aug 2010 08:48:20 +1000
  19 +
1 20 comixcursors (0.7-1) unstable; urgency=low
2 21  
3 22 * The “Gourou” release.
... ...
debian/comixcursors-lefthanded-opaque.docs 0 → 120000
... ... @@ -0,0 +1 @@
  1 +comixcursors-righthanded.docs
0 2 \ No newline at end of file
... ...
debian/comixcursors-lefthanded-opaque.install 0 → 100644
... ... @@ -0,0 +1,2 @@
  1 +usr/share/icons/ComixCursors-LH-Opaque-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}
  2 +etc/X11/cursors/ComixCursors-LH-Opaque-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}.theme
... ...
debian/comixcursors-lefthanded.docs 0 → 120000
... ... @@ -0,0 +1 @@
  1 +comixcursors-righthanded.docs
0 2 \ No newline at end of file
... ...
debian/comixcursors-lefthanded.install 0 → 100644
... ... @@ -0,0 +1,2 @@
  1 +usr/share/icons/ComixCursors-LH-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}
  2 +etc/X11/cursors/ComixCursors-LH-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}.theme
... ...
debian/comixcursors-righthanded-opaque.docs 0 → 120000
... ... @@ -0,0 +1 @@
  1 +comixcursors-righthanded.docs
0 2 \ No newline at end of file
... ...
debian/comixcursors-righthanded-opaque.install 0 → 100644
... ... @@ -0,0 +1,2 @@
  1 +usr/share/icons/ComixCursors-Opaque-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}
  2 +etc/X11/cursors/ComixCursors-Opaque-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}.theme
... ...
debian/comixcursors-righthanded.docs 0 → 100644
... ... @@ -0,0 +1,3 @@
  1 +README
  2 +NEWS
  3 +AUTHORS
... ...
debian/comixcursors-righthanded.install 0 → 100644
... ... @@ -0,0 +1,2 @@
  1 +usr/share/icons/ComixCursors-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}
  2 +etc/X11/cursors/ComixCursors-{Black,Blue,Green,Orange,Red,White}-{Small,Regular,Large,Huge}{,-Slim}.theme
... ...
debian/control
... ... @@ -10,14 +10,21 @@ Build-Depends:
10 10 imagemagick,
11 11 x11-apps,
12 12 debhelper (>= 7.0.50)
13   -Standards-Version: 3.8.4
14   -Homepage: http://opendesktop.org/content/show.php?content=32627
  13 +Standards-Version: 3.9.1
  14 +Homepage: http://opendesktop.org/content/show.php/ComixCursors?content=32627
15 15  
16   -Package: comixcursors
  16 +Package: comixcursors-righthanded
17 17 Architecture: all
18 18 Depends:
19   - ${shlibs:Depends}, ${misc:Depends}
20   -Description: X11 mouse pointer themes with a comic art feeling
  19 + ${misc:Depends}
  20 +Suggests:
  21 + comixcursors-lefthanded,
  22 + comixcursors-righthanded-opaque,
  23 + comixcursors-lefthanded-opaque
  24 +Provides: comixcursors
  25 +Replaces: comixcursors (<< 0.7)
  26 +Breaks: comixcursors (<< 0.7)
  27 +Description: X11 mouse pointer themes with a comic art feeling (RH, translucent)
21 28 ComixCursors is a set of mouse pointer themes for X11 in the style of
22 29 comic-book art.
23 30 .
... ... @@ -25,7 +32,67 @@ Description: X11 mouse pointer themes with a comic art feeling
25 32 * 6 different colors (black, blue, green, orange, red, white)
26 33 * 4 different sizes (small, regular, large, huge)
27 34 * 2 different weights (slim, normal)
28   - * translucent or opaque
29   - * right-handed or left-handed
30 35 .
31   - and some additional “bonus” options.
  36 + This package installs the “original” (right-handed, translucent)
  37 + ComixCursors themes, and some additional “bonus” variants.
  38 +
  39 +Package: comixcursors-lefthanded
  40 +Architecture: all
  41 +Depends:
  42 + ${misc:Depends}
  43 +Suggests:
  44 + comixcursors-righthanded,
  45 + comixcursors-righthanded-opaque,
  46 + comixcursors-lefthanded-opaque
  47 +Breaks: comixcursors (<< 0.7)
  48 +Description: X11 mouse pointer themes with a comic art feeling (LH, translucent)
  49 + ComixCursors is a set of mouse pointer themes for X11 in the style of
  50 + comic-book art.
  51 + .
  52 + The package includes cursor themes in a wide combination of variants:
  53 + * 6 different colors (black, blue, green, orange, red, white)
  54 + * 4 different sizes (small, regular, large, huge)
  55 + * 2 different weights (slim, normal)
  56 + .
  57 + This package installs the left-handed, translucent ComixCursors
  58 + themes.
  59 +
  60 +Package: comixcursors-righthanded-opaque
  61 +Architecture: all
  62 +Depends:
  63 + ${misc:Depends}
  64 +Suggests:
  65 + comixcursors-righthanded,
  66 + comixcursors-lefthanded,
  67 + comixcursors-lefthanded-opaque
  68 +Breaks: comixcursors (<< 0.7)
  69 +Description: X11 mouse pointer themes with a comic art feeling (RH, opaque)
  70 + ComixCursors is a set of mouse pointer themes for X11 in the style of
  71 + comic-book art.
  72 + .
  73 + The package includes cursor themes in a wide combination of variants:
  74 + * 6 different colors (black, blue, green, orange, red, white)
  75 + * 4 different sizes (small, regular, large, huge)
  76 + * 2 different weights (slim, normal)
  77 + .
  78 + This package installs the right-handed, opaque ComixCursors themes.
  79 +
  80 +Package: comixcursors-lefthanded-opaque
  81 +Architecture: all
  82 +Depends:
  83 + ${misc:Depends}
  84 +Suggests:
  85 + comixcursors-righthanded,
  86 + comixcursors-lefthanded,
  87 + comixcursors-righthanded-opaque
  88 +Breaks: comixcursors (<< 0.7)
  89 +Description: X11 mouse pointer themes with a comic art feeling (LH, opaque)
  90 + ComixCursors is a set of mouse pointer themes for X11 in the style of
  91 + comic-book art.
  92 + .
  93 + The package includes cursor themes in a wide combination of variants:
  94 + * 6 different colors (black, blue, green, orange, red, white)
  95 + * 4 different sizes (small, regular, large, huge)
  96 + * 2 different weights (slim, normal)
  97 + .
  98 + This package installs the left-handed, opaque ComixCursors themes.
... ...
debian/patches/01-custom-destdir.patch 0 → 100644
... ... @@ -0,0 +1,123 @@
  1 +Description: Use standard ‘DESTDIR’ environment variable to override destination directory.
  2 +Origin: Created to fix build issues in Debian packaging of multiple binary packages.
  3 +Author: Ben Finney <ben+debian@benfinney.id.au>
  4 +Last-Update: 2010-06-13
  5 +
  6 +=== modified file 'Makefile'
  7 +--- old/Makefile 2010-06-03 02:52:32 +0000
  8 ++++ new/Makefile 2010-06-13 04:54:24 +0000
  9 +@@ -27,7 +27,6 @@
  10 + CURSORSNAME = ComixCursors
  11 + PACKAGENAME ?= ${CURSORSNAME}
  12 + SUMMARY ?= The original Comix Cursors
  13 +-ICONSDIR ?= ${HOME}/.icons
  14 + THEMENAME ?= custom
  15 +
  16 + GENERATED_FILES :=
  17 +@@ -49,8 +48,14 @@
  18 + xcursor_builddir = cursors
  19 + distdir = dist
  20 +
  21 +-destdir = ${ICONSDIR}/${CURSORSNAME}-${THEMENAME}
  22 +-xcursor_destdir = ${destdir}/cursors
  23 ++ifdef DESTDIR
  24 ++icons_destdir = ${DESTDIR}/usr/share/icons
  25 ++else
  26 ++icons_destdir = ${HOME}/.icons
  27 ++endif
  28 ++
  29 ++theme_destdir = ${icons_destdir}/${CURSORSNAME}-${THEMENAME}
  30 ++xcursor_destdir = ${theme_destdir}/cursors
  31 +
  32 + template_configfile = ${configdir}/custom.CONFIG
  33 + template_themefile = ${configdir}/custom.theme
  34 +@@ -89,22 +94,22 @@
  35 + .PHONY: install
  36 + install: all
  37 + # Create necessary directories.
  38 +- install -d "${ICONSDIR}" "${ICONSDIR}/default"
  39 +- $(RM) -r "${destdir}"
  40 ++ install -d "${icons_destdir}" "${icons_destdir}/default"
  41 ++ $(RM) -r "${theme_destdir}"
  42 + install -d "${xcursor_destdir}"
  43 +
  44 + # Install the cursors.
  45 + install -m u=rw,go=r "${xcursor_builddir}"/* "${xcursor_destdir}"
  46 +
  47 + # Install the theme configuration file.
  48 +- install -m u=rw,go=r "${themefile}" "${destdir}"/index.theme
  49 ++ install -m u=rw,go=r "${themefile}" "${theme_destdir}"/index.theme
  50 +
  51 + # Install alternative name symlinks for the cursors.
  52 + $(LINK_CURSORS) "${xcursor_destdir}"
  53 +
  54 + .PHONY: uninstall
  55 + uninstall:
  56 +- $(RM) -r "${destdir}"
  57 ++ $(RM) -r "${theme_destdir}"
  58 +
  59 +
  60 + .PHONY: custom-theme
  61 +
  62 +=== modified file 'build-distribution'
  63 +--- old/build-distribution 2010-06-03 02:25:26 +0000
  64 ++++ new/build-distribution 2010-06-13 04:54:24 +0000
  65 +@@ -43,6 +43,7 @@
  66 + printf "Packaging %s %s...\n" "$themename_root" $VERSION
  67 +
  68 + workdir="$(mktemp -t -d)"
  69 ++DESTDIR="${workdir}/dest"
  70 +
  71 + #
  72 + # source package
  73 +@@ -68,10 +69,9 @@
  74 + printf "Installing cursor files...\n"
  75 +
  76 + # Make a temporary directory for installing icons into.
  77 +-ICONSDIR="${workdir}/icons"
  78 +-export ICONSDIR
  79 +-mkdir --parents "${ICONSDIR}"
  80 ++icons_destdir="${DESTDIR}/usr/share/icons"
  81 +
  82 ++export DESTDIR
  83 + ./install-all
  84 +
  85 + function package_variant {
  86 +@@ -93,7 +93,7 @@
  87 +
  88 + packagedir="${workdir}/${PACKAGENAME}"
  89 + mkdir --parents "$packagedir"
  90 +- mv "${ICONSDIR}/${PACKAGENAME}"* "$packagedir"/.
  91 ++ mv "${icons_destdir}/${PACKAGENAME}"* "$packagedir"/.
  92 +
  93 + tarfile="${distdir}/${PACKAGENAME}-${VERSION}.tar.bz2"
  94 + tar -cjf "$tarfile" --directory "$packagedir" --files-from <(
  95 +
  96 +=== modified file 'install-all'
  97 +--- old/install-all 2010-06-02 11:53:50 +0000
  98 ++++ new/install-all 2010-06-13 04:54:24 +0000
  99 +@@ -27,10 +27,6 @@
  100 +
  101 + bindir="$(dirname $0)"/bin
  102 +
  103 +-# Set the ICONSDIR destination to a default (if not already set).
  104 +-ICONSDIR=${ICONSDIR:-~/.icons}
  105 +-export ICONSDIR
  106 +-
  107 + # argument processing and usage
  108 + function show_usage_message {
  109 + cat <<_EOT_
  110 +@@ -66,9 +62,9 @@
  111 + # Build the cursors for a particular theme.
  112 + THEMENAME="$1"
  113 +
  114 +- destdir="${ICONSDIR}/${themename_stem}-${THEMENAME}"
  115 +- if [ -d "${destdir}" ] ; then
  116 +- rm -r "${destdir}"
  117 ++ theme_destdir="${DESTDIR}/${themename_stem}-${THEMENAME}"
  118 ++ if [ -d "${theme_destdir}" ] ; then
  119 ++ rm -r "${theme_destdir}"
  120 + fi
  121 +
  122 + export THEMENAME
  123 +
... ...
debian/patches/series 0 → 100644
... ... @@ -0,0 +1 @@
  1 +01-custom-destdir.patch
... ...
debian/preinst
... ... @@ -16,16 +16,29 @@ set -e
16 16 REMOVED_LIST=""
17 17 ICONDIR=/etc/X11/cursors
18 18  
  19 +remove_omitted_alternatives () {
  20 + # Remove themes installed by previous versions but omitted
  21 + # from this version of the package.
  22 +
  23 + if ! update-alternatives --quiet --list x-cursor-theme ; then
  24 + # No alternatives installed for ‘x-cursor-theme’, so we're
  25 + # done. We need to test this explicitly to avoid exiting with
  26 + # an error when listing the alternatives.
  27 + return
  28 + fi
  29 +
  30 + installed_cursor_themes=`update-alternatives --list x-cursor-theme`
  31 + for theme in $REMOVED_LIST ; do
  32 + if echo "$installed_cursor_themes" | grep -q $theme ; then
  33 + update-alternatives --remove $ICONDIR/$theme
  34 + rm -f $ICONDIR/$theme
  35 + fi
  36 + done
  37 +}
  38 +
19 39 case "$1" in
20 40 upgrade)
21   - # Remove themes installed by previous versions but omitted
22   - # from this version of the package.
23   - for theme in $REMOVED_LIST ; do
24   - if update-alternatives --list x-cursor-theme | grep -q $theme ; then
25   - update-alternatives --remove $ICONDIR/$theme
26   - rm -f $ICONDIR/$theme
27   - fi
28   - done
  41 + remove_omitted_alternatives
29 42 ;;
30 43  
31 44 install|abort-upgrade)
... ...
debian/rules
... ... @@ -11,14 +11,22 @@
11 11 # Uncomment this to turn on verbose mode.
12 12 #export DH_VERBOSE=1
13 13  
14   -PACKAGEDIR = $(CURDIR)/debian/comixcursors
15   -ICON_DESTDIR = ${PACKAGEDIR}/usr/share/icons
  14 +PACKAGE_BUILDDIR = $(CURDIR)/debian/build
  15 +INSTALLDIR = $(CURDIR)/debian/tmp
  16 +ICONS_DIR = usr/share/icons
  17 +icons_builddir = ${PACKAGE_BUILDDIR}/${ICONS_DIR}
  18 +icons_wrapdir = ${PACKAGE_BUILDDIR}/etc/X11/cursors
  19 +icons_installdir = ${INSTALLDIR}/${ICONS_DIR}
  20 +icons_destdir = ${DESTDIR}/${ICONS_DIR}
16 21  
17   -WRAP_THEMES = debian/wrap-cursor-themes
  22 +INSTALL = install
  23 +WRAP_THEMES = ./debian/wrap-cursor-themes
18 24  
19 25  
20 26 .PHONY: build
  27 +build: export DESTDIR=${PACKAGE_BUILDDIR}
21 28 build:
  29 + $(INSTALL) -d ${PACKAGE_BUILDDIR}
22 30 dh build
23 31  
24 32 .PHONY: clean
... ... @@ -26,12 +34,12 @@ clean:
26 34 dh clean
27 35  
28 36 .PHONY: install
29   -install: export ICONSDIR := ${ICON_DESTDIR}
30 37 install: build
31   - dh install
32   -
  38 + $(INSTALL) -d ${icons_wrapdir}
33 39 chmod +x ${WRAP_THEMES}
34   - $(WRAP_THEMES)
  40 + PACKAGE_BUILDDIR=${PACKAGE_BUILDDIR} $(WRAP_THEMES)
  41 +
  42 + dh install
35 43  
36 44 .PHONY: binary-indep
37 45 binary-indep: build install
... ... @@ -51,6 +59,8 @@ override_dh_auto_clean:
51 59 .PHONY: override_dh_auto_build
52 60 override_dh_auto_build:
53 61 # Skip auto-detection of build tool.
  62 + DESTDIR=${PACKAGE_BUILDDIR} ./install-all
  63 + rmdir ${icons_builddir}/default
54 64  
55 65 .PHONY: override_dh_auto_test
56 66 override_dh_auto_test:
... ... @@ -59,8 +69,8 @@ override_dh_auto_test:
59 69 .PHONY: override_dh_auto_install
60 70 override_dh_auto_install:
61 71 # Skip auto-detection of build tool.
62   - ./install-all
63   - rmdir ${ICON_DESTDIR}/default
  72 + $(INSTALL) -d ${INSTALLDIR}
  73 + cp -a ${PACKAGE_BUILDDIR}/. ${INSTALLDIR}/.
64 74  
65 75 .PHONY: override_dh_installchangelogs
66 76 override_dh_installchangelogs:
... ...
debian/wrap-cursor-themes
... ... @@ -16,13 +16,11 @@
16 16  
17 17 set -e
18 18  
19   -CURDIR=`pwd`
20   -packagedir=${CURDIR}/debian/comixcursors
21   -icondir=${packagedir}/usr/share/icons
22   -wrapperdir=${packagedir}/etc/X11/cursors
  19 +icons_builddir=${PACKAGE_BUILDDIR}/usr/share/icons
  20 +wrapperdir=${PACKAGE_BUILDDIR}/etc/X11/cursors
23 21  
24 22 temp_theme=$(mktemp -t)
25   -for theme_dir in ${icondir}/ComixCursors-* ; do
  23 +for theme_dir in ${icons_builddir}/ComixCursors-* ; do
26 24 theme_name=$(basename $theme_dir)
27 25 theme_file=${theme_dir}/index.theme
28 26 {
... ...