diff -Nru icon-slicer-0.3/debian/cdbs/1/rules/buildinfo.mk icon-slicer-0.3/debian/cdbs/1/rules/buildinfo.mk --- icon-slicer-0.3/debian/cdbs/1/rules/buildinfo.mk 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/cdbs/1/rules/buildinfo.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2004-2007 Jonas Smedegaard -# Description: Generate and include build information -# -# 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; either version 2, or (at -# your option) any later version. -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_rules_buildinfo -_cdbs_rules_buildinfo = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo - -common-install-arch common-install-indep:: debian/stamp-buildinfo - -debian/stamp-buildinfo: - dh_buildinfo - touch debian/stamp-buildinfo - -clean:: - rm -f debian/stamp-buildinfo - -endif diff -Nru icon-slicer-0.3/debian/cdbs/1/rules/copyright-check.mk icon-slicer-0.3/debian/cdbs/1/rules/copyright-check.mk --- icon-slicer-0.3/debian/cdbs/1/rules/copyright-check.mk 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/cdbs/1/rules/copyright-check.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2005-2008 Jonas Smedegaard -# Description: Check for changes to copyright notices in source -# -# 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; either version 2, or (at -# your option) any later version. -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_rules_copyright_check -_cdbs_rules_copyright_check := 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7) - -# Set to yes to fail on changed/new hints are found -#DEB_COPYRIGHT_CHECK_STRICT := yes - -# Single regular expression for files to include or ignore -DEB_COPYRIGHT_CHECK_REGEX = .* -#DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$ -DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^debian/(changelog|copyright(|_hints|_newhints))$ - -pre-build:: debian/stamp-copyright-check - -debian/stamp-copyright-check: - @echo 'Scanning upstream source for new/changed copyright notices...' - @echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \ - "| some-output-filtering..." - -# Perl in shell in make requires extra care: -# * Single-quoting ('...') protects against shell expansion -# * Double-dollar ($$) expands to plain dollar ($) in make - @licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \ - | LC_ALL=C perl -e \ - 'print "Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION\n";'\ - 'print "Name: Untrusted draft - double-check copyrights yourself!\n\n";'\ - '$$n=0; while (<>) {'\ - ' s/[^[:print:]]//g;'\ - ' if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\ - ' $$files[$$n]{name}=$$1;'\ - ' $$files[$$n]{license}=$$2;'\ - ' };'\ - ' if (/^\s*\[Copyright:\s*(\S.*?)\s*\]/) {'\ - ' $$files[$$n]{copyright}=$$1;'\ - ' };'\ - ' /^$$/ and $$n++;'\ - '};'\ - 'foreach $$file (@files) {'\ - ' $$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\ - ' $$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\ - ' $$file->{license} =~ s/\s+\(v([^)]+)\)/-$$1/;'\ - ' $$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\ - ' $$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN ($$1)/;'\ - ' $$file->{license} =~ s/\s+(GENERATED FILE)/ ($$1)/;'\ - ' $$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\ - ' $$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\ - ' $$file->{copyright} =~ s/\b(\d{4})\s+([\S^\d])/$$1, $$2/g;'\ - ' $$file->{copyright} =~ s/^\W*\s+\/\s+//g;'\ - ' $$file->{copyright} =~ s/\s+\/\s+\W*$$//;'\ - ' $$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\ - ' $$pattern = "$$file->{license} [$$file->{copyright}]";'\ - ' push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\ - '};'\ - 'foreach $$pattern ( sort {'\ - ' @{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\ - ' ||'\ - ' $$a cmp $$b'\ - ' } keys %patternfiles ) {'\ - ' ($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\ - ' print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\ - ' print "Copyright: $$copyright\n";'\ - ' print "License: $$license\n\n";'\ - '};'\ - > debian/copyright_newhints - @patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \ - echo "Found $$patterncount different copyright and licensing combinations." - @if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi - @newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \ - if [ -n "$$newstrings" ]; then \ - echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \ - echo; \ - echo "$$newstrings"; \ - echo; \ - echo "To fix the situation please do the following:"; \ - echo " 1) Investigate the above changes and update debian/copyright as needed"; \ - echo " 2) Replace debian/copyright_hints with debian/copyright_newhints"; \ - $(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \ - else \ - echo 'No new copyright notices found - assuming no news is good news...'; \ - rm -f debian/copyright_newhints; \ - fi - touch $@ - -clean:: - rm -f debian/stamp-copyright-check - -endif diff -Nru icon-slicer-0.3/debian/cdbs/1/rules/package-relations.mk icon-slicer-0.3/debian/cdbs/1/rules/package-relations.mk --- icon-slicer-0.3/debian/cdbs/1/rules/package-relations.mk 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/cdbs/1/rules/package-relations.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2008 Jonas Smedegaard -# Description: Resolve, cleanup and apply package relationships -# -# 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; either version 2, or (at -# your option) any later version. -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_rules_package_relations -_cdbs_rules_package_relations = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -# Merge build-dependencies on same packages -# TODO: rewrite (in perl, probably) to be more generic -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.43)/ s/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\|0.4.39\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27)/ s/\bcdbs *\(,\|(>= \(0.4.23-1.1\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 7.0.1)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\|5.0.44\|6\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 6)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\|5.0.44\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.44)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.37.2)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.28)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.21)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\))\)/, /g') -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.0)/ s/\bdebhelper *\(,\|(>= \(4.1.60\))\)/, /g') - -# TODO: Move these to buildcore.mk -cdbs_curvar = $(or $($(1)_$(cdbs_curpkg)),$($1)) -cdbs_squash_commas = $(shell echo '$1' | sed -e 's/ *,[ ,]*/, /g' -e 's/^[ ,]*//' -e 's/[ ,]*$$//') - -# Cleanup superfluous commas and whitespace -CDBS_BUILD_DEPENDS := $(call cdbs_squash_commas,$(CDBS_BUILD_DEPENDS)) - -comma = , -cdbs_all_cur_squash_commas = $(call cdbs_squash_commas,$($(1)_ALL)$(comma) $(call cdbs_curvar,$1)) - -# Apply CDBS-declared dependencies to binary packages -$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: - @echo 'Adding cdbs dependencies to debian/$(cdbs_curpkg).substvars' - @echo 'cdbs:Depends=$(call cdbs_all_cur_squash_commas,CDBS_DEPENDS)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Pre-Depends=$(call cdbs_all_cur_squash_commas,CDBS_PREDEPENDS)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Recommends=$(call cdbs_all_cur_squash_commas,CDBS_RECOMMENDS)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Suggests=$(call cdbs_all_cur_squash_commas,CDBS_SUGGESTS)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Breaks=$(call cdbs_all_cur_squash_commas,CDBS_BREAKS)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Provides=$(call cdbs_all_cur_squash_commas,CDBS_PROVIDES)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Replaces=$(call cdbs_all_cur_squash_commas,CDBS_REPLACES)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Conflicts=$(call cdbs_all_cur_squash_commas,CDBS_CONFLICTS)' >> debian/$(cdbs_curpkg).substvars - @echo 'cdbs:Enhances=$(call cdbs_all_cur_squash_commas,CDBS_ENHANCES)' >> debian/$(cdbs_curpkg).substvars - -endif diff -Nru icon-slicer-0.3/debian/cdbs/1/rules/upstream-tarball.mk icon-slicer-0.3/debian/cdbs/1/rules/upstream-tarball.mk --- icon-slicer-0.3/debian/cdbs/1/rules/upstream-tarball.mk 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/cdbs/1/rules/upstream-tarball.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2007-2008 Jonas Smedegaard -# Description: Convenience rules for dealing with upstream tarballs -# -# 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; either version 2, or (at -# your option) any later version. -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_rules_upstream_tarball -_cdbs_rules_upstream_tarball := 1 - -include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix) - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39) - -# Prefix for upstream location of all upstream tarballs (mandatory!) -#DEB_UPSTREAM_URL = - -DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE) -DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION)) -DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz -# Checksum to ensure integrity of downloadeds using get-orig-source (optional) -#DEB_UPSTREAM_TARBALL_MD5 = - -DEB_UPSTREAM_WORKDIR = ../tarballs - -# Base filename (without extension) as used in upstream URL -DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION) - -# Perl regexp to change locally used string into that in upstream URL and srcdir -#DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = - -# Base directory within tarball -DEB_UPSTREAM_TARBALL_SRCDIR = $(cdbs_upstream_tarball_basename) - -# Space-delimited list of directories and files to strip (optional) -#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt -DEB_UPSTREAM_REPACKAGE_TAG = dfsg -DEB_UPSTREAM_REPACKAGE_DELIMITER = ~ - -# TODO: Move this to buildcore.mk -cdbs_findargs-path-or-name = $(if $(findstring /,$(firstword $(1))),-path './$(patsubst ./%,%,$(firstword $(1)))',-name '$(firstword $(1))') $(foreach obj,$(wordlist 2,$(words $(1)),$(1)),-or $(if $(findstring /,$(obj)),-path './$(obj:./%=%)',-name '$(obj)')) - -cdbs_upstream_tarball_basename = $(if $(strip $(DEB_UPSTREAM_TARBALL_BASENAME_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_BASENAME)' | perl -pe '$(DEB_UPSTREAM_TARBALL_BASENAME_MANGLE)'),$(DEB_UPSTREAM_TARBALL_BASENAME)) -cdbs_upstream_tarball = $(cdbs_upstream_tarball_basename).$(DEB_UPSTREAM_TARBALL_EXTENSION) -cdbs_upstream_received_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION)) -cdbs_upstream_local_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)) -cdbs_upstream_local_srcdir = $(cdbs_upstream_tarball_basename)$(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)) - -# # These variables are deprecated -_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL DEB_UPSTREAM_TARBALL_VERSION_MANGLE -_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES -DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES) - -print-version: - @@echo "Debian version: $(DEB_VERSION)" - @@echo "Upstream version: $(DEB_UPSTREAM_TARBALL_VERSION)" - -get-orig-source: - @@dh_testdir - @@mkdir -p "$(DEB_UPSTREAM_WORKDIR)" - - @if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ] ; then \ - if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ] ; then \ - rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \ - fi ; \ - echo "Downloading $(cdbs_upstream_received_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \ - wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \ - else \ - echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \ - fi - - @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" | sed -e 's/ .*//'`; \ - if [ -n "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \ - if [ "$$md5current" != "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \ - echo "Expecting upstream tarball md5sum $(DEB_UPSTREAM_TARBALL_MD5), but $$md5current found" ; \ - echo "Upstream tarball md5sum is NOT trusted! Possible upstream tarball forge!" ; \ - echo "Purging downloaded file. Try new download." ; \ - rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \ - false ; \ - else \ - echo "Upstream tarball is trusted!" ; \ - fi; \ - else \ - echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \ - fi - -# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and -# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2) -# TODO: Add .orig suffix to top folder inside tarball when only -# recompressing (when $uncompress set and ...REPACKAGE_EXCLUDE unset) - @untar="tar -x -C"; \ - case "$(cdbs_upstream_received_tarball)" in \ - *.tar.gz) unpack="gunzip -c";; \ - *.tar.bz2) unpack="bunzip2 -c"; uncompress="bunzip2";; \ - *.tar.Z) unpack="uncompress -c"; uncompress="uncompress";; \ - *.zip) unpack="unzip -q"; uncompress="false"; untar="-d"; nopipe="true";; \ - *.tar) unpack="cat"; uncompress="true";; \ - *) echo "Unknown extension for upstream tarball $(cdbs_upstream_received_tarball)"; false;; \ - esac && \ - if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \ - echo "Repackaging tarball ..." && \ - mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \ - if [ -n "$$nopipe" ]; then \ - $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" \ - $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ - else \ - $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" \ - | $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ - fi && \ - if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_local_srcdir)" ]; then \ - mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_local_srcdir)"; \ - fi && \ - GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_local_srcdir)" && \ - echo "Cleaning up" && \ - rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \ - elif [ -n "$$uncompress" ]; then \ - echo "Recompressing tarball ..." && \ - $$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)"; \ - gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar"; \ - fi - -fail-source-not-repackaged: - @if find . $(call cdbs_findargs-path-or-name,$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)) | grep '.*'; then \ - echo; \ - echo 'ERROR: Source contains the files/paths listed above'; \ - echo ' which was intended to not be distributed with the source.'; \ - echo ' Please repackage source with these items stripped!'; \ - echo ' (get-orig-source target can automate this - see README.source)'; \ - exit 1; \ - fi - -DEB_PHONY_RULES += print-version get-orig-source fail-source-not-repackaged - -endif diff -Nru icon-slicer-0.3/debian/changelog icon-slicer-0.3/debian/changelog --- icon-slicer-0.3/debian/changelog 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/changelog 2012-03-14 22:00:50.000000000 +0000 @@ -1,3 +1,33 @@ +icon-slicer (0.3-6) unstable; urgency=low + + * Modernize CDBS usage: Drop local snippets (all included upstream + now). + * Use dpkg source format 3.0 (quilt). Stop including patchsys-quilt + snippet. + * Bump debhelper compat level to 7. + * Bump standards-version to 3.9.3. + * Use anonscm.debian.org URL in Vcs-Browser field. + * Git-ignore quilt .pc dir. + * Update package relations: + + Build-depend unversioned on libgtk2.0-dev: Needed version + satisfied even in oldstable. + + Tighten build-dependency on cdbs: Needed for improved copyright- + check. + + Relax build-depend unversioned on debhelper and devscripts: Needed + versions satisfied even in oldstable. + + Stop build-depending on quilt or patchutils: Unneeded with source + format 3.0 (quilt). + + Build-depend (not only depend) on x11-apps: Needed to build + example files. + * Append (not early-(re)declare) build-dependencies. + * Extend copyright years of Debian packaging. + * Refresh patch 1001 with shortening quilt options -pab --no-index + --no-timestamps. + * Suppress copyright-checking binary files, to not upset dpkg-source. + * Rewrite copyright file using format 1.0. + + -- Jonas Smedegaard Wed, 14 Mar 2012 23:00:39 +0100 + icon-slicer (0.3-5) unstable; urgency=low * Depend on x11-apps. Related to bug#555963. diff -Nru icon-slicer-0.3/debian/compat icon-slicer-0.3/debian/compat --- icon-slicer-0.3/debian/compat 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/compat 2012-03-14 21:23:06.000000000 +0000 @@ -1 +1 @@ -6 +7 diff -Nru icon-slicer-0.3/debian/control icon-slicer-0.3/debian/control --- icon-slicer-0.3/debian/control 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/control 2012-03-14 22:00:36.000000000 +0000 @@ -3,10 +3,17 @@ Priority: optional Maintainer: Debian OLPC Uploaders: Jonas Smedegaard -Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), debhelper (>= 6), dh-buildinfo, libgtk2.0-dev (>= 2.0.0), libpopt-dev, help2man -Standards-Version: 3.8.3 +Build-Depends: cdbs (>= 0.4.70~), + devscripts, + debhelper, + dh-buildinfo, + libgtk2.0-dev, + libpopt-dev, + help2man, + x11-apps +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/collab-maint/icon-slicer.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/icon-slicer.git;a=summary +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/icon-slicer.git Homepage: http://freedesktop.org/wiki/Software/icon-slicer Package: icon-slicer diff -Nru icon-slicer-0.3/debian/control.in icon-slicer-0.3/debian/control.in --- icon-slicer-0.3/debian/control.in 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/control.in 2012-03-14 21:24:02.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Debian OLPC Uploaders: Jonas Smedegaard Build-Depends: @cdbs@ -Standards-Version: 3.8.3 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/collab-maint/icon-slicer.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/icon-slicer.git;a=summary +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/icon-slicer.git Homepage: http://freedesktop.org/wiki/Software/icon-slicer Package: icon-slicer diff -Nru icon-slicer-0.3/debian/copyright icon-slicer-0.3/debian/copyright --- icon-slicer-0.3/debian/copyright 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/copyright 2012-03-14 21:47:08.000000000 +0000 @@ -1,56 +1,94 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=54 -Name: icon-slicer -Contact: Owen Taylor +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: icon-slicer +Upstream-Contact: Owen Taylor Source: http://freedesktop.org/software/icon-slicer/releases/ - http://webcvs.freedesktop.org/icon-theme/icon-slicer/ + http://webcvs.freedesktop.org/icon-theme/icon-slicer/ -Copyright: 2003, Red Hat, Inc -License: MIT +Copyright: 2003, Red Hat, Inc. +License: MIT~Redhat -Files: Makefile.in +Files: */Makefile.in Copyright: 1994-2003, Free Software Foundation, Inc. -License: other-GAP - This Makefile.in is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. +License: GAP~Makefile.in -Files: ./depcomp - ./missing +Files: depcomp + missing Copyright: 1996-1997, 1999-2000, 2002, Free Software Foundation, Inc -License: GPL-2+ or Autoconf +License: GPL-2+ with Autoconf exception As a special exception to the GNU General Public License, if you distribute this file as part of a program that contains a configuration script generated by Autoconf, you may include it under the same distribution terms that you use for the rest of that program. -Files: ./aclocal.m4 +Files: aclocal.m4 Copyright: 1996-2003, Free Software Foundation, Inc -License: GPL-2+ +License: GAP and GPL-2+ -Files: ./configure +Files: configure Copyright: 1992-1996, 1998-2002, Free Software Foundation, Inc -License: other-GAP - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. +License: GAP~configure -Files: ./install-sh +Files: install-sh Copyright: 1991, the Massachusetts Institute of Technology -License: other-MIT +License: MIT Files: debian/* -Copyright: 2004-2009, Jonas Smedegaard +Copyright: 2009,2012, Jonas Smedegaard License: GPL-2+ -License: other-MIT - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation, and that the name of M.I.T. not be used in advertising or - publicity pertaining to distribution of the software without specific, - written prior permission. M.I.T. makes no representations about the - suitability of this software for any purpose. It is provided "as is" - without express or implied warranty. +License: MIT~Redhat + Permission to use, copy, modify, distribute, and sell this software and + its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Red Hat not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. Red Hat makes no + representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + . + RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +License: MIT + Permission to use, copy, modify, distribute, and sell this software and + its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of M.I.T. not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. M.I.T. makes no + representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + +License: GAP + This file is free software; the Free Software Foundation gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. + +License: GAP~Makefile.in + This Makefile.in is free software; the Free Software Foundation + gives unlimited permission to copy and/or distribute it, + with or without modifications, as long as this notice is preserved. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. + +License: GAP~configure + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. License: GPL-2+ On Debian GNU systems, the complete text of GNU General Public License diff -Nru icon-slicer-0.3/debian/copyright_hints icon-slicer-0.3/debian/copyright_hints --- icon-slicer-0.3/debian/copyright_hints 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/copyright_hints 2012-03-14 21:36:29.000000000 +0000 @@ -1,103 +1,102 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION -Name: Untrusted draft - double-check copyrights yourself! +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FIXME +Upstream-Contact: FIXME +Source: FIXME +Disclaimer: Autogenerated by CDBS Files: AUTHORS - ChangeLog - Makefile.am - NEWS - README - TODO - config.h.in - configure.ac - debian/README.source - debian/compat - debian/control - debian/control.in - debian/gbp.conf - debian/patches/1001_hotspotfix.patch - debian/patches/README - debian/patches/series - debian/watch - examples/Makefile.am - examples/sample-cursors-24-1.png - examples/sample-cursors-24-2.png - examples/sample-cursors-24-hotspot.png - examples/sample-icons-24-attachpoints.png - examples/sample-icons-24-embeddedrect.png - examples/sample.cursortheme - examples/sample.icontheme - mkinstalldirs - src/Makefile.am + ChangeLog + Makefile.am + NEWS + TODO + config.h.in + configure.ac + debian/README.source + debian/compat + debian/control + debian/control.in + debian/gbp.conf + debian/patches/1001_hotspotfix.patch + debian/patches/README + debian/patches/series + debian/source/format + debian/watch + examples/Makefile.am + examples/sample.cursortheme + examples/sample.icontheme + mkinstalldirs + src/Makefile.am Copyright: *No copyright* License: UNKNOWN + FIXME Files: Makefile.in - examples/Makefile.in - src/Makefile.in -Copyright: 1994-2003 -License: UNKNOWN (GENERATED FILE) - -Files: src/main.c - src/themefile.c - src/themefile.h + configure + examples/Makefile.in + src/Makefile.in +Copyright: 1992-1996, 1998-2001 + 1992-1996, 1998-2002, + 1994-2003 +License: UNKNOWN + FIXME + +Files: README + src/main.c + src/themefile.c + src/themefile.h Copyright: 2003, Red Hat, Inc License: UNKNOWN - -Files: missing -Copyright: 1996-1997, 1999-2000, 2002, Free Software Foundation, Inc -License: GPL (GENERATED FILE) + FIXME Files: depcomp -Copyright: 1999-2000, Free Software Foundation, Inc -License: GPL (GENERATED FILE) + missing +Copyright: 1996-1997, 1999-2000, 2002 Free Software Foundation, Inc + 1999-2000, Free Software Foundation, Inc +License: GPL-2+ + FIXME Files: aclocal.m4 -Copyright: 1996-2003, - 1996-2002 -License: GPL - -Files: debian/cdbs/1/rules/buildinfo.mk -Copyright: 2004-2007, Jonas Smedegaard -License: GPL - -Files: debian/cdbs/1/rules/upstream-tarball.mk -Copyright: 2007-2008, Jonas Smedegaard -License: GPL - -Files: debian/cdbs/1/rules/package-relations.mk -Copyright: 2008, Jonas Smedegaard -License: GPL - -Files: debian/rules -Copyright: 2009, Jonas Smedegaard -License: GPL - -Files: debian/cdbs/1/rules/copyright-check.mk -Copyright: \s*(\S.*?)\s*\ -License: GPL - -Files: configure -Copyright: 1992-1996, 1998-2002 -License: UNKNOWN (GENERATED FILE) +Copyright: 1996-1997, 2000-2001, Free Software Foundation, Inc + 1996-2002, + 1996-2003, + 1997, 1999-2001, Free Software Foundation, Inc + 1997, 2000-2001, Free Software Foundation, Inc + 1999-2002, Free Software Foundation, Inc + 1999-2003, Free Software Foundation, Inc + 2001, Free Software Foundation, Inc + 2001-2002, Free Software Foundation, Inc + 2002, Free Software Foundation, Inc + 2003, Free Software Foundation, Inc +License: GPL-2+ + FIXME Files: COPYING -Copyright: 1989, 1991, Free Software Foundation, Inc - the software, and -License: UNKNOWN +Copyright: 1989, 1991 Free Software Foundation, Inc + + HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + HOLDERS AND/OR OTHER PARTIES + disclaimer" for the program, if + holder saying it may be distributed + holder who places the Program under this License + interest in the program + law: + the software, and + year name of author +License: GPL-2+ + FIXME -Files: install-sh -Copyright: 1991, by the Massachusetts Institute of Technology -License: UNKNOWN +Files: debian/rules +Copyright: 2009,2012, Jonas Smedegaard +License: GPL-2+ + FIXME Files: INSTALL Copyright: 1994-1996, 1999-2002, Free Software License: UNKNOWN + FIXME -Files: examples/sample-icons-24.png -Copyright: In/RU|_*BmkFZ2\f{Igsdw*~iv4FJW.Zz?Ecc#^t222(l>M1y7pf!R;L3Q?E{|;m62<}?$K7NF 2z.s;(0"Ig/#i$j3gp/n}Aq=C!FU -License: UNKNOWN - -Files: examples/sample-icons-16.png -Copyright: MZcLHSzdbQa@`3%{>y=KDF7Q n"wttRZ}5JEbbbX;f K{?~wj{n`kbydk,SUb((7395 +Files: install-sh +Copyright: 1991, the Massachusetts Institute of Technology License: UNKNOWN + FIXME diff -Nru icon-slicer-0.3/debian/patches/1001_hotspotfix.patch icon-slicer-0.3/debian/patches/1001_hotspotfix.patch --- icon-slicer-0.3/debian/patches/1001_hotspotfix.patch 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/patches/1001_hotspotfix.patch 2012-03-14 21:31:33.000000000 +0000 @@ -1,6 +1,6 @@ Description: Fix hotspot y coordinate Author: Tim Swast -diff -ruN a/src/main.c b/src/main.c + --- a/src/main.c +++ b/src/main.c @@ -103,7 +103,7 @@ diff -Nru icon-slicer-0.3/debian/rules icon-slicer-0.3/debian/rules --- icon-slicer-0.3/debian/rules 2012-04-30 22:12:41.000000000 +0000 +++ icon-slicer-0.3/debian/rules 2012-03-14 21:59:23.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2009 Jonas Smedegaard +# Copyright © 2009,2012 Jonas Smedegaard # Description: Main Debian packaging script for icon-slicer # # This program is free software; you can redistribute it and/or @@ -18,17 +18,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. -ifneq (,$(DEB_MAINTAINER_MODE)) - # Enable stuff not policy compliant (eg. unsuitable for build daemons) - DEB_COPYRIGHT_CHECK_STRICT = yes - DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes -endif -include debian/cdbs/1/rules/upstream-tarball.mk -include debian/cdbs/1/rules/copyright-check.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/upstream-tarball.mk +include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/1/rules/buildinfo.mk pkg = icon-slicer cmd = $(pkg) @@ -36,6 +29,9 @@ DEB_UPSTREAM_URL = http://freedesktop.org/software/$(pkg)/releases #DEB_UPSTREAM_TARBALL_MD5 = e9997dd73ad5af43aadd49ac89105b33 +# suppress checking binary files, to not upset dpkg-source +DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(examples/.*\.png|debian/(changelog|copyright(|_hints|_newhints)))$ + LDFLAGS += -Wl,--as-needed DEB_INSTALL_EXAMPLES_$(pkg) = examples/sample* examples/Sample @@ -52,14 +48,13 @@ rm -f debian/$(cmd).1 # Needed by upstream build process -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libgtk2.0-dev (>= 2.0.0), libpopt-dev +CDBS_BUILD_DEPENDS += , libgtk2.0-dev, libpopt-dev # Needed for our packaging -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), help2man +CDBS_BUILD_DEPENDS += , help2man -# Needed (always) at runtime +# Needed both at build time and (always) at runtime # * x11-apps (xcursorgen) needed by icon-slider binary -CDBS_DEPENDS = x11-apps - -# Merge duplicate build-dependencies -include debian/cdbs/1/rules/package-relations.mk +depends = x11-apps +CDBS_BUILD_DEPENDS += , $(depends) +CDBS_DEPENDS_DEFAULT = $(depends) diff -Nru icon-slicer-0.3/debian/source/format icon-slicer-0.3/debian/source/format --- icon-slicer-0.3/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ icon-slicer-0.3/debian/source/format 2012-04-30 22:12:41.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)