diff -Nru libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# Copyright © 2008 Jonas Smedegaard -# Description: A class to configure and build GNU autoconf+automake packages -# -# 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_class_autotools -_cdbs_class_autotools = 1 - -include debian/cdbs/1/class/autotools-vars.mk -include $(_cdbs_class_path)/autotools-files.mk$(_cdbs_makefile_suffix) - -cdbs_autotools_curflavorflags = $(if $(DEB_CONFIGURE_FLAGS_$(cdbs_curpkg)),$(DEB_CONFIGURE_FLAGS_$(cdbs_curpkg)),$(DEB_CONFIGURE_FLAGS)) - -cdbs_autotools_configure_stamps = $(if $(DEB_MAKE_FLAVORS),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools-configure/%,$(DEB_MAKE_FLAVORS)),debian/stamp-autotools-configure) -cdbs_autotools_flags = $(cdbs_autotools_curflavorflags) $(DEB_CONFIGURE_EXTRA_FLAGS) - -# Overriden from makefile-vars.mk. We pass CFLAGS and friends to ./configure, so -# no need to pass them to make. -DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(cdbs_make_curbuilddir) - -pre-build:: - $(if $(DEB_MAKE_FLAVORS),mkdir -p debian/stamp-autotools-configure) - -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(cdbs_autotools_configure_stamps) -$(cdbs_autotools_configure_stamps): - chmod a+x $(DEB_CONFIGURE_SCRIPT) - mkdir -p $(cdbs_make_curbuilddir) - $(DEB_CONFIGURE_INVOKE) $(cdbs_autotools_flags) $(DEB_CONFIGURE_USER_FLAGS) - $(if $(filter post,$(DEB_AUTO_UPDATE_LIBTOOL)),if [ -e $(cdbs_make_curbuilddir)/libtool ]; then cp -f /usr/bin/libtool $(cdbs_make_curbuilddir)/libtool; fi) - touch $@ - -cleanbuilddir:: $(patsubst %,cleanbuilddir/%,$(DEB_MAKE_FLAVORS)) - rm -rf debian/stamp-autotools-configure - -DEB_PHONY_RULES += $(patsubst %,cleanbuilddir/%,$(DEB_MAKE_FLAVORS)) -$(patsubst %,cleanbuilddir/%,$(DEB_MAKE_FLAVORS)):: - -rmdir $(cdbs_make_curbuilddir) -# FIXME: Avoid force-removing! -# -rm -rf $(cdbs_make_curbuilddir) - rm -f debian/stamp-autotools-configure/$(cdbs_make_curflavor) - -endif diff -Nru libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools-vars.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools-vars.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools-vars.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/autotools-vars.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# Copyright © 2008 Jonas Smedegaard -# Description: Common variables for GNU autoconf+automake packages -# -# 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_class_autotools_vars -_cdbs_class_autotools_vars = 1 - -#include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix) -include debian/cdbs/1/class/makefile.mk - -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) -DEB_MAKE_CLEAN_TARGET = distclean -#DEB_MAKE_CHECK_TARGET = check - -DEB_AC_AUX_DIR = $(DEB_SRCDIR) - -DEB_CONFIGURE_SCRIPT = $(CURDIR)/$(DEB_SRCDIR)/configure -DEB_CONFIGURE_SCRIPT_ENV = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" -DEB_CONFIGURE_NORMAL_ARGS = --build=$(DEB_BUILD_GNU_TYPE) --prefix=$(DEB_CONFIGURE_PREFIX) --includedir=$(DEB_CONFIGURE_INCLUDEDIR) --mandir=$(DEB_CONFIGURE_MANDIR) --infodir=$(DEB_CONFIGURE_INFODIR) --sysconfdir=$(DEB_CONFIGURE_SYSCONFDIR) --localstatedir=$(DEB_CONFIGURE_LOCALSTATEDIR) --libexecdir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-maintainer-mode --disable-dependency-tracking - -# Provide --host only if different from --build, as recommended in -# autotools-dev README.Debian: When provided (even if equal) autotools -# 2.52+ switches to cross-compiling mode. - -ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) -DEB_CONFIGURE_NORMAL_ARGS += --host=$(DEB_HOST_GNU_TYPE) -endif - -### TODO: Fix the above to also handle 2.13 which needs other tweaks -### (read autotools-dev README.Debian!). For now we conflict with -### autoconf2.13! - -# This magic is required because otherwise configure wants to analyse -# $0 to see whether a VPATH build is needed. This tells it with -# absolute certainly that this is NOT a VPATH build. -DEB_CONFIGURE_NORMAL_ARGS += $(if $(subst $(DEB_SRCDIR),,$(cdbs_make_curbuilddir)),,--srcdir=.) - -DEB_CONFIGURE_INVOKE = cd $(cdbs_make_curbuilddir) && $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) -DEB_CONFIGURE_PREFIX =/usr -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_CONFIGURE_MANDIR ="\$${prefix}/share/man" -DEB_CONFIGURE_INFODIR ="\$${prefix}/share/info" -DEB_CONFIGURE_SYSCONFDIR =/etc -DEB_CONFIGURE_LOCALSTATEDIR =/var -DEB_CONFIGURE_LIBEXECDIR ="\$${prefix}/lib/$(DEB_SOURCE_PACKAGE)" -DEB_CONFIGURE_EXTRA_FLAGS = - -ifneq (, $(DEB_AUTO_UPDATE_LIBTOOL)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtool -endif - -ifneq (:, $(DEB_AUTO_UPDATE_ACLOCAL):$(DEB_AUTO_UPDATE_AUTOMAKE)) -ifeq ($(DEB_AUTO_UPDATE_ACLOCAL), $(DEB_AUTO_UPDATE_AUTOMAKE)) -# avoid duped build-dependencies -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), automake$(DEB_AUTO_UPDATE_ACLOCAL) -else -# either only one of them is required, or different versions are -ifneq (, $(DEB_AUTO_UPDATE_ACLOCAL)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), automake$(DEB_AUTO_UPDATE_ACLOCAL) -endif -ifneq (, $(DEB_AUTO_UPDATE_AUTOMAKE)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), automake$(DEB_AUTO_UPDATE_AUTOMAKE) -endif -endif -endif - -ifneq (:, $(DEB_AUTO_UPDATE_AUTOCONF):$(DEB_AUTO_UPDATE_AUTOHEADER)) -ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), $(DEB_AUTO_UPDATE_AUTOHEADER)) -# avoid duped build-dependencies -ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), 2.13) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf2.13 -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf -endif -else -# either only one of them is required, or different versions are -ifneq (, $(DEB_AUTO_UPDATE_AUTOCONF)) -ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), 2.13) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf2.13 -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf -endif -endif -ifneq (, $(DEB_AUTO_UPDATE_AUTOHEADER)) -ifeq ($(DEB_AUTO_UPDATE_AUTOHEADER), 2.13) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf2.13 -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autoconf -endif -endif -endif -endif - -endif diff -Nru libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# Copyright © 2008 Jonas Smedegaard -# Description: Builds and cleans packages which have a Makefile -# -# 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_class_makefile -_cdbs_class_makefile = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -#include $(_cdbs_class_path)/makefile-vars.mk$(_cdbs_makefile_suffix) -include debian/cdbs/1/class/makefile-vars.mk - -DEB_PHONY_RULES += makefile-clean - -# TODO: Move these to buildvars.mk -cdbs_curpkgbuilddir = $(if $(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_BUILDDIR)) -cdbs_curpkgdestdir = $(if $(DEB_DESTDIR_$(cdbs_curpkg)),$(DEB_DESTDIR_$(cdbs_curpkg)),$(DEB_DESTDIR)) - -cdbs_make_builddir_check = $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),$(error DEB_MAKE_FLAVORS in use: DEB_BUILDDIR must be different from DEB_SRCDIR, and needs to be declared before including makefile.mk)) -cdbs_make_build_targets = $(if $(DEB_MAKE_FLAVORS),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-build/%,$(DEB_MAKE_FLAVORS)),debian/stamp-makefile-build) -cdbs_make_install_targets = $(if $(DEB_MAKE_FLAVORS),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-install/%,$(DEB_MAKE_FLAVORS)),debian/stamp-makefile-install) -cdbs_make_check_targets = $(if $(DEB_MAKE_FLAVORS),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-check/%,$(DEB_MAKE_FLAVORS)),debian/stamp-makefile-check) -cdbs_make_clean_targets = $(if $(DEB_MAKE_CLEAN_TARGET),$(if $(DEB_MAKE_FLAVORS),$(patsubst %,makefile-clean/%,$(DEB_MAKE_FLAVORS)),makefile-clean)) -cdbs_make_curflavor = $(notdir $@) -cdbs_make_curbuilddir = $(if $(DEB_MAKE_FLAVORS),$(subst @FLAVOR@,$(cdbs_make_curflavor),$(DEB_MAKE_FLAVORS_BUILDDIRSKEL)),$(cdbs_curpkgbuilddir)) -cdbs_make_curdestdir = $(if $(DEB_MAKE_FLAVORS),$(subst @FLAVOR@,$(cdbs_make_curflavor),$(DEB_MAKE_FLAVORS_DESTDIRSKEL)),$(cdbs_curpkgdestdir)) - -pre-build:: - $(if $(DEB_MAKE_FLAVORS),mkdir -p debian/stamp-makefile-build debian/stamp-makefile-install) - $(if $(and $(DEB_MAKE_FLAVORS),$(DEB_MAKE_CHECK_TARGET)),mkdir -p debian/stamp-makefile-check) - -common-build-arch common-build-indep:: $(cdbs_make_build_targets) -$(cdbs_make_build_targets): - +$(DEB_MAKE_INVOKE) $(DEB_MAKE_BUILD_TARGET) - touch $@ - -cleanbuilddir:: makefile-clean -makefile-clean:: $(cdbs_make_clean_targets) - $(if $(DEB_MAKE_CLEAN_TARGET),,@echo "DEB_MAKE_CLEAN_TARGET unset, not running clean") - rm -rf debian/stamp-makefile-build debian/stamp-makefile-install - -DEB_PHONY_RULES += makefile-clean $(cdbs_make_clean_targets) -$(cdbs_make_clean_targets):: - +-$(DEB_MAKE_INVOKE) -k $(DEB_MAKE_CLEAN_TARGET) - -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: $(cdbs_make_install_targets) -$(cdbs_make_install_targets): - $(if $(DEB_MAKE_INSTALL_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET),@echo "DEB_MAKE_INSTALL_TARGET unset, skipping default makefile.mk common-install target") - $(if $(DEB_MAKE_INSTALL_TARGET),touch $@) - -ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -common-build-arch common-build-indep:: $(cdbs_make_check_targets) -$(cdbs_make_check_targets) : debian/stamp-makefile-check% : debian/stamp-makefile-build% - $(if $(DEB_MAKE_CHECK_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_CHECK_TARGET),@echo "DEB_MAKE_CHECK_TARGET unset, not running checks") - $(if $(DEB_MAKE_CHECK_TARGET),touch $@) - -clean:: - rm -rf debian/stamp-makefile-check -endif - -endif diff -Nru libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile-vars.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile-vars.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile-vars.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/class/makefile-vars.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# Copyright © 2008 Jonas Smedegaard -# Description: Defines useful variables for packages which have a Makefile -# -# 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_class_makefile_vars -_cdbs_class_makefile_vars = 1 - -include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) - -DEB_MAKE_MAKEFILE = -DEB_MAKE_ENVVARS = -DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) $(if $(DEB_MAKE_MAKEFILE), -f $(DEB_MAKE_MAKEFILE),) -C $(cdbs_make_curbuilddir) CFLAGS=$(if $(CFLAGS_$(cdbs_curpkg)),"$(CFLAGS_$(cdbs_curpkg))","$(CFLAGS)") CXXFLAGS=$(if $(CXXFLAGS_$(cdbs_curpkg)),"$(CXXFLAGS_$(cdbs_curpkg))","$(CXXFLAGS)") CPPFLAGS=$(if $(CPPFLAGS_$(cdbs_curpkg)),"$(CPPFLAGS_$(cdbs_curpkg))","$(CPPFLAGS)") LDFLAGS=$(if $(LDFLAGS_$(cdbs_curpkg)),"$(LDFLAGS_$(cdbs_curpkg))","$(LDFLAGS)") - -# This variable is deprecated. -DEB_BUILD_MAKE_TARGET = -_cdbs_deprecated_vars += DEB_BUILD_MAKE_TARGET -# New in 0.2.8. -DEB_MAKE_BUILD_TARGET = $(DEB_BUILD_MAKE_TARGET) - -# If your Makefile provides an "install" target, you need to give the requisite commands -# here to install it into the staging directory. For automake-using programs, this -# looks like: install DESTDIR=$(DEB_DESTDIR) -# If you're using automake though, you likely want to be including autotools.mk instead -# of this file. - -# This variable is deprecated. -DEB_CLEAN_MAKE_TARGET = clean -_cdbs_deprecated_vars += DEB_CLEAN_MAKE_TARGET -_cdbs_deprecated_DEB_CLEAN_MAKE_TARGET_default := $(DEB_CLEAN_MAKE_TARGET) -# New in 0.2.8. -DEB_MAKE_CLEAN_TARGET = $(DEB_CLEAN_MAKE_TARGET) - -# This variable is deprecated. -DEB_MAKE_TEST_TARGET = -_cdbs_deprecated_vars += DEB_MAKE_TEST_TARGET -# New in 0.2.8. -# New in 0.4.2. -DEB_MAKE_CHECK_TARGET = $(DEB_MAKE_TEST_TARGET) - -# NB! This needs to be declared _before_ including makefile -#DEB_MAKE_FLAVORS = - -DEB_MAKE_FLAVORS_BUILDDIRSKEL = $(DEB_BUILDDIR)/@FLAVOR@ -# You should probably either change this or set per-package DEB_DESTDIR_xxx -DEB_MAKE_FLAVORS_DESTDIRSKEL = $(DEB_DESTDIR) - -endif diff -Nru libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/buildinfo.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/buildinfo.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/buildinfo.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/buildinfo.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2004-2006 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 libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/copyright-check.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/copyright-check.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/copyright-check.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/copyright-check.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +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)(\..*)?)$ - -pre-build:: debian/stamp-copyright-check - -debian/stamp-copyright-check: - @echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...' - -# 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 \ - '$$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->{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;'\ - ' $$pattern = "$$file->{license} [$$file->{copyright}]";'\ - ' push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\ - '};'\ - 'foreach $$pattern ( sort {'\ - ' @{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\ - ' ||'\ - ' $$a cmp $$b'\ - ' } keys %patternfiles ) {'\ - ' print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\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 libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/upstream-tarball.mk libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/upstream-tarball.mk --- libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/upstream-tarball.mk 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/cdbs/1/rules/upstream-tarball.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,139 +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 - -# Perl regexp to change locally used string into that in upstream URL and srcdir -#DEB_UPSTREAM_TARBALL_VERSION_MANGLE -cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION)) - -# Base filename (without extension) as used in upstream URL -DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled) - -# Base directory within tarball -DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled) - -# 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 = ~ - -cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION) -cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION)) -cdbs_upstream_repackaged_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig -cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar - -# # These variables are deprecated -_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL -_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_local_tarball)" ] ; then \ - if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \ - rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \ - fi ; \ - echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \ - wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \ - else \ - echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \ - fi - - @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_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_local_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) - @untar="tar -x -C"; \ - case "$(cdbs_upstream_local_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_local_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_local_tarball)" \ - $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ - else \ - $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \ - | $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \ - fi && \ - if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_repackaged_basename)" ]; then \ - mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \ - fi && \ - if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \ - GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \ - else \ - GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \ - fi && \ - 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_local_tarball)"; \ - gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \ - fi - -DEB_PHONY_RULES += print-version get-orig-source - -endif diff -Nru libgd2-2.0.36~rc1~dfsg/debian/changelog libgd2-2.0.36~rc1~dfsg/debian/changelog --- libgd2-2.0.36~rc1~dfsg/debian/changelog 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/changelog 2010-12-12 16:06:16.000000000 +0100 @@ -1,3 +1,51 @@ +libgd2 (2.0.36~rc1~dfsg-5ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #689279). Remaining changes: + - debian/control: Drop unnecessary build dependency 'gnulib'. + + -- Angel Abad Sun, 12 Dec 2010 15:54:38 +0100 + +libgd2 (2.0.36~rc1~dfsg-5) unstable; urgency=low + + * Workaround CDBS not honoring per-flavor configure flags yet. + Closes: bug#595709. Thanks to brian m. carlson. + * Ease building with git-buildpackage: + + Git-ignore quilt .pc dir. + + Add dpkg source local-options. + * Update copyright-check suppression: + + Fix add ./ prefix. + + Suppress demo/test graphics. + + Avoid suppressing the whole debian subdir. + + -- Jonas Smedegaard Sun, 17 Oct 2010 15:11:45 +0200 + +libgd2 (2.0.36~rc1~dfsg-4) unstable; urgency=low + + * Acknowledge NMUs. Thanks to Giuseppe Iuculano and Robert Lemmen. + * Drop local CDBS snippets: All included in main cdbs package now. As + local snippets conflicted with recent releases of the cdbs package + this closes: bug#564374. Thanks to Lucas Nussbaum and Philipp Kern. + Tighten build-dependency on cdbs. + * Use dpkg source format "3.0 (quilt)". Drop patchsys-quilt.mk and + related dependencies. + * Packaging moved to Git: + + Update Vcs-* stanzas. + + Add git-buildpackage config enabling pristine-tar and signed tags. + * Add README.source documenting use of CDBS and git-buildpackage, and + drop README.cdbs-tweaks. Drop cdbs comments in debian/rules. + * Add DEP3 hints ot patch. + * Update packaging hall of shame in TODO. + * Rewrite debian/copyright using draft DEP5 format rev. 135. + * Preserve (not clean) upstream-shipped tempfile during build. + * Depend on ${misc:Depends}. Thanks to lintian. + * Bump up standards-version to 3.9.1. + * Use $(filter ...) instead of $(findstring ...) to extract space- + separated options from DEB_BUILD_OPTIONS in debian/rules. + * Build-depend unversioned on d-shlibs (needed version satisfied in + oldstable). + + -- Jonas Smedegaard Sun, 05 Sep 2010 14:36:52 +0200 + libgd2 (2.0.36~rc1~dfsg-3.2ubuntu1) maverick; urgency=low * Merge from Debian testing (LP: #606384). Remaining changes: @@ -936,4 +984,3 @@ * Initial package, based upon libgd1. (Closes: #102179, #102494) -- Ivo Timmermans Sat, 18 Aug 2001 19:55:14 +0200 - diff -Nru libgd2-2.0.36~rc1~dfsg/debian/control libgd2-2.0.36~rc1~dfsg/debian/control --- libgd2-2.0.36~rc1~dfsg/debian/control 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/control 2010-12-12 15:51:20.000000000 +0100 @@ -4,15 +4,29 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: GD team Uploaders: Jonas Smedegaard , Sean Finney -Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), dh-buildinfo, debhelper (>= 5.0.44), libpng12-dev, libz-dev, libjpeg-dev, libfreetype6-dev, libxpm-dev, libx11-dev, libxt-dev, libfontconfig-dev, d-shlibs (>= 0.30), html2text -Vcs-Svn: svn://svn.debian.org/svn/pkg-gd/libgd2/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-gd/libgd2/trunk -Standards-Version: 3.7.3 +Build-Depends: cdbs (>= 0.4.70~), + autotools-dev, + debhelper (>= 6), + dh-buildinfo, + devscripts (>= 2.10.7~), + libpng12-dev, + libz-dev, + libjpeg-dev, + libfreetype6-dev, + libxpm-dev, + libx11-dev, + libxt-dev, + libfontconfig-dev, + d-shlibs, + html2text +Vcs-Git: git://git.debian.org/git/collab-maint/libgd2 +Vcs-Browser: http://git.debian.org/?p=collab-maint/libgd2.git;a=summary +Standards-Version: 3.9.1 Homepage: http://www.libgd.org/ Package: libgd-tools Architecture: any -Depends: ${shlibs:Depends}, ${perl:Depends} +Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} Suggests: libgd2-noxpm-dev | libgd2-xpm-dev Description: GD command line tools and example code GD is a graphics library. It allows your code to quickly draw images @@ -27,7 +41,7 @@ Package: libgd2-xpm-dev Architecture: any Section: libdevel -Depends: libgd2-xpm (= ${binary:Version}), ${devlibs:Depends} +Depends: libgd2-xpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-noxpm-dev Provides: libgd-dev Description: GD Graphics Library version 2 (development version) @@ -43,7 +57,7 @@ Package: libgd2-noxpm-dev Architecture: any Section: libdevel -Depends: libgd2-noxpm (= ${binary:Version}), ${devlibs:Depends} +Depends: libgd2-noxpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-xpm-dev Provides: libgd-dev Description: GD Graphics Library version 2 (development version) @@ -59,7 +73,7 @@ Package: libgd2-xpm Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-noxpm Provides: libgd2 Suggests: libgd-tools @@ -76,7 +90,7 @@ Package: libgd2-noxpm Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-xpm Provides: libgd2 Suggests: libgd-tools diff -Nru libgd2-2.0.36~rc1~dfsg/debian/control.in libgd2-2.0.36~rc1~dfsg/debian/control.in --- libgd2-2.0.36~rc1~dfsg/debian/control.in 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/control.in 2010-10-17 20:00:04.000000000 +0200 @@ -5,14 +5,14 @@ XSBC-Original-Maintainer: GD team Uploaders: Jonas Smedegaard , Sean Finney Build-Depends: @cdbs@ -Vcs-Svn: svn://svn.debian.org/svn/pkg-gd/libgd2/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-gd/libgd2/trunk -Standards-Version: 3.7.3 +Vcs-Git: git://git.debian.org/git/collab-maint/libgd2 +Vcs-Browser: http://git.debian.org/?p=collab-maint/libgd2.git;a=summary +Standards-Version: 3.9.1 Homepage: http://www.libgd.org/ Package: libgd-tools Architecture: any -Depends: ${shlibs:Depends}, ${perl:Depends} +Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} Suggests: libgd2-noxpm-dev | libgd2-xpm-dev Description: GD command line tools and example code GD is a graphics library. It allows your code to quickly draw images @@ -27,7 +27,7 @@ Package: libgd2-xpm-dev Architecture: any Section: libdevel -Depends: libgd2-xpm (= ${binary:Version}), ${devlibs:Depends} +Depends: libgd2-xpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-noxpm-dev Provides: libgd-dev Description: GD Graphics Library version 2 (development version) @@ -43,7 +43,7 @@ Package: libgd2-noxpm-dev Architecture: any Section: libdevel -Depends: libgd2-noxpm (= ${binary:Version}), ${devlibs:Depends} +Depends: libgd2-noxpm (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Conflicts: libgd-dev, libgd-noxpm-dev, libgd-xpm-dev, libgd2-xpm-dev Provides: libgd-dev Description: GD Graphics Library version 2 (development version) @@ -59,7 +59,7 @@ Package: libgd2-xpm Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-noxpm Provides: libgd2 Suggests: libgd-tools @@ -76,7 +76,7 @@ Package: libgd2-noxpm Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgd2, libgd2-xpm Provides: libgd2 Suggests: libgd-tools diff -Nru libgd2-2.0.36~rc1~dfsg/debian/copyright libgd2-2.0.36~rc1~dfsg/debian/copyright --- libgd2-2.0.36~rc1~dfsg/debian/copyright 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/copyright 2010-10-17 20:00:04.000000000 +0200 @@ -1,130 +1,197 @@ -This is GD 2.x packaged for Debian GNU systems. - - - -Upstream source: http://www.libgd.org/releases/ - - - -Upstream author: Pierre-Alain Joye - - - -The following files from the upstream source has been omitted in this -distribution due to missing or problematic licensing information: - -VMS/*: some files lack copyright info - -cmake/*: some files lack copyright info - -test/*: unusable without cmake modules, and truetype file lack license - - - -Copyright and licensing info, main source: - - Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002 by Cold Spring Harbor Laboratory. Funded under Grant - P41-RR02188 by the National Institutes of Health. - - Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by - Boutell.Com, Inc. - - Portions relating to GD2 format copyright 1999, 2000, 2001, 2002 - Philip Warner. - - Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg - Roelofs. - - Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John - Ellson (ellson@lucent.com). - - Portions relating to gdft.c copyright 2001, 2002 John Ellson - (ellson@lucent.com). - - Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Pierre-Alain Joye (pierre@libgd.org). - - Portions relating to JPEG and to color quantization copyright 2000, - 2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This software is - based in part on the work of the Independent JPEG Group. See the - file README-JPEG.TXT for more information. - - Portions relating to WBMP copyright 2000, 2001, 2002 Maurice - Szmurlo and Johan Van den Brande. - - Permission has been granted to copy, distribute and modify gd in - any context without fee, including a commercial application, - provided that this notice is present in user-accessible supporting - documentation. - - This does not affect your ownership of the derived work itself, and - the intent is to assure proper credit for the authors of gd, not to - interfere with your productive use of gd. If you have questions, - ask. "Derived works" includes all programs that utilize the - library. Credit must be given in user-accessible documentation. - - This software is provided "AS IS." The copyright holders disclaim - all warranties, either express or implied, including but not - limited to implied warranties of merchantability and fitness for a - particular purpose, with respect to this code and accompanying - documentation. - - Although their code does not appear in gd, the authors wish to thank - David Koblas, David Rowley, and Hutchison Avenue Software Corporation - for their prior contributions. - - - -Copyright and licensing info, gd_gif_out.c: - -/* Code drawn from ppmtogif.c, from the pbmplus package -** -** Based on GIFENCOD by David Rowley . A -** Lempel-Zim compression based on "compress". -** -** Modified by Marcel Wijkstra -** -** Copyright (C) 1989 by Jef Poskanzer. -** -** Permission to use, copy, modify, and distribute this software and its -** documentation for any purpose and without fee is hereby granted, provided -** that the above copyright notice appear in all copies and that both that -** copyright notice and this permission notice appear in supporting -** documentation. This software is provided "as is" without express or -** implied warranty. -** -** The Graphics Interchange Format(c) is the Copyright property of -** CompuServe Incorporated. GIF(sm) is a Service Mark property of -** CompuServe Incorporated. -*/ - - - -Copyright and licensing info, strlcpy.c: - - * Copyright (c) 1998 Todd C. Miller - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 +Name: GD +Maintainer: Pierre-Alain Joye +Source: http://www.libgd.org/releases/ + +X-Stripped: ./VMS/*, ./cmake/* +X-Stripped-Reason: some files lack copyright info + +X-Stripped: ./test/* +X-Stripped-Reason: unusable without cmake modules, and truetype file lack license + +Copyright: 1997-2007, Thomas Boutell, Pierre-Alain Joye and contributors +License: other-GD + +Files: Makefile.in +Copyright: 1994-2006, Free Software Foundation, Inc. +License: other-GAP-Makefile.in + +Files: ,/depcomp, + ./ltmain.sh, + ./missing +Copyright: 1996-2005, Free Software Foundation, Inc +License: GPL-2+ or other-SA-Autoconf + +Files: ./wbmp.[ch] +Copyright: 2000, Johan Van den Brande +License: UNKNOWN + +Files: ./strlcpy.c +Copyright: 1998, Todd C. Miller +License: BSD + Copyright (c) 1998 Todd C. Miller + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: ./configure +Copyright: 1992-1996, 1998-2006 +License: other-GAP-configure + +Files: ./install-sh +Copyright: 1991, the Massachusetts Institute of Technology +License: UNKNOWN + +Files: ./gd_topal.c +Copyright: 1991-1996, Thomas G. Lane +License: UNKNOWN + +Files: ./gd_png.c +Copyright: 1999, Greg Roelofs and Thomas Boutell +License: UNKNOWN + +Files: ./gd_gd2.c +Copyright: 1999, Philip Warner +License: UNKNOWN + +Files: ./gd_jpeg.c +Copyright: 2000, Doug Becker +License: UNKNOWN + +Files: ./gd_wbmp.c +Copyright: 2000, Maurice Szmurlo + ????, Johan Van den Brande +License: other + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. This software is provided "as is" without express or + implied warranty. + +Files: ./gd_gif_out.c +Copyright: is the property of + 1989, by Jef Poskanzer +License: other + Code drawn from ppmtogif.c, from the pbmplus package + . + Based on GIFENCOD by David Rowley . A + Lempel-Zim compression based on "compress". + . + Modified by Marcel Wijkstra + . + Copyright (C) 1989 by Jef Poskanzer. + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. This software is provided "as is" without express or + implied warranty. + . + The Graphics Interchange Format(c) is the Copyright property of + CompuServe Incorporated. GIF(sm) is a Service Mark property of + CompuServe Incorporated. + +Files: ./debian/* +Copyright: 2001, Ivo Timmermans + 2002-2010, Jonas Smedegaard +License: GPL-2+ + +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 as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License (GPL) version 2 can be found at + /usr/share/common-licenses/GPL-2. + +License: other-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. + +License: other-GAP-configure + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + +License: other-SA-Autoconf + 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. + +License: other-GD + Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002 by Cold Spring Harbor Laboratory. Funded under Grant + P41-RR02188 by the National Institutes of Health. + . + Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by + Boutell.Com, Inc. + . + Portions relating to GD2 format copyright 1999, 2000, 2001, 2002 + Philip Warner. + . + Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg + Roelofs. + . + Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John + Ellson (ellson@lucent.com). + . + Portions relating to gdft.c copyright 2001, 2002 John Ellson + (ellson@lucent.com). + . + Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Pierre-Alain Joye (pierre@libgd.org). + . + Portions relating to JPEG and to color quantization copyright 2000, + 2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This software is + based in part on the work of the Independent JPEG Group. See the + file README-JPEG.TXT for more information. + . + Portions relating to WBMP copyright 2000, 2001, 2002 Maurice + Szmurlo and Johan Van den Brande. + . + Permission has been granted to copy, distribute and modify gd in + any context without fee, including a commercial application, + provided that this notice is present in user-accessible supporting + documentation. + . + This does not affect your ownership of the derived work itself, and + the intent is to assure proper credit for the authors of gd, not to + interfere with your productive use of gd. If you have questions, + ask. "Derived works" includes all programs that utilize the + library. Credit must be given in user-accessible documentation. + . + This software is provided "AS IS." The copyright holders disclaim + all warranties, either express or implied, including but not + limited to implied warranties of merchantability and fitness for a + particular purpose, with respect to this code and accompanying + documentation. + . + Although their code does not appear in gd, the authors wish to thank + David Koblas, David Rowley, and Hutchison Avenue Software Corporation + for their prior contributions. diff -Nru libgd2-2.0.36~rc1~dfsg/debian/copyright_hints libgd2-2.0.36~rc1~dfsg/debian/copyright_hints --- libgd2-2.0.36~rc1~dfsg/debian/copyright_hints 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/copyright_hints 2010-10-17 20:00:04.000000000 +0200 @@ -1,113 +1,301 @@ -*No copyright* UNKNOWN []: CMakeLists.txt - ChangeLog - Makefile.am - NEWS - README-JPEG.TXT - README.TESTING - README.TXT - annotate.c - bdftogd - bootstrap.sh - circletexttest.c - config.h.cmake - config.hin - config/Makefile.am - config/gdlib-config.in - config/mkinstalldirs - configure.ac - demoin.png - entities.html - err.out - fontconfigtest.c - fontsizetest.c - fontwheeltest.c - gd.c - gd.h - gd2copypal.c - gd2time.c - gd2togif.c - gd2topng.c - gd_gd.c - gd_gif_in.c - gd_io.c - gd_io.h - gd_io_dp.c - gd_io_file.c - gd_io_ss.c - gd_security.c - gd_ss.c - gdcache.c - gdcache.h - gdcmpgif.c - gddemo.c - gdfontg.c - gdfontg.h - gdfontl.c - gdfontl.h - gdfontmb.c - gdfontmb.h - gdfonts.c - gdfonts.h - gdfontt.c - gdfontt.h - gdft.c - gdfx.c - gdfx.h - gdhelpers.c - gdhelpers.h - gdkanji.c - gdparttopng.c - gdtables.c - gdtest.c - gdtestft.c - gdtopng.c - gdxpm.c - gifanimtest.c - giftogd2.c - index.html - install-item - jisx0208.h - mkinstalldirs - netware/get_ver.awk - netware/keepscreen.c - netware/nwlibc.c - pngtogd.c - pngtogd2.c - readme.jpn - test/Makefile.am - test/gdtest.gd2 - test/gdtest_wbmp_to_png.png - testac.c - testtr.c - webpng.c - windows/Makefile -*No copyright* GENERATED FILE []: entities.h - entities.tcl - netware/get_exp.awk -GENERATED FILE [1994-2002]: Makefile.in - config/Makefile.in - test/Makefile.in -GPL GENERATED FILE [1996-1997, 1999-2000, 2002 Free Software Foundation, Inc]: config/missing - missing -GPL GENERATED FILE [1999-2000 Free Software Foundation, Inc]: config/depcomp - depcomp -UNKNOWN [2000 Johan Van den Brande ]: wbmp.c - wbmp.h -BSD (3 clause) [1998 Todd C. Miller ]: strlcpy.c -GENERATED FILE [1992-1996, 1998-2001]: configure -GENERATED FILE [1997-2007 Thomas Boutell, Pierre-Alain Joye and contributors, see COPYING\0"]: windows/libgd.rc -GPL-2+ GENERATED FILE [1996-2001, 2003-2005]: config/ltmain.sh -UNKNOWN [(#"P"d8`x$Q@+GS6du.HS_C"BMDXkPEjo,Z77gV).*i+FV85qreGzEmP=bd;Pr0EyQ5kS{aZc,*dcVgmwjk`Xe]: test/gdtest_200_300_150_100.png -UNKNOWN [1991 by the Massachusetts Institute of Technology]: install-sh -UNKNOWN [1991-1996, Thomas G. Lane]: gd_topal.c -UNKNOWN [1994-1996, 1999-2002 Free Software]: INSTALL -UNKNOWN [1996-2007 Boutell.Com, Inc]: netware/Makefile -UNKNOWN [1999 Greg Roelofs and Thomas Boutell]: gd_png.c -UNKNOWN [1999, Philip Warner]: gd_gd2.c -UNKNOWN [1999-2002 John / 1996-2002 by / 2000-2002 Maurice / 1999-2002 / holders disclaim / 1999-2002 Greg / 2000-2007 / 2001-2002 John Ellson / 1994-2001 / 1994-1997 / 2000]: COPYING -UNKNOWN [2000 Doug Becker, mailto:thebeckers@home.com]: gd_jpeg.c -UNKNOWN [6b#b8fXp?tZyttU[LE3_{/ }tu){QDf,R|GMFa3;]: test/gdtest.png -UNKNOWN [Johan Van den Brande (johan@vandenbrande.com) / Maurice Szmurlo --- T-SIT --- January 2000]: gd_wbmp.c -UNKNOWN [is the property of / 1989 by Jef Poskanzer]: gd_gif_out.c -UNKNOWN [{ymDj>dPoL`]: test/gdtest_merge.png +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 +X-Draft: Autogenerated by CDBS snippet copyright-check.mk + +Files: ./CMakeLists.txt, + ./ChangeLog, + ./Makefile.am, + ./NEWS, + ./README.TESTING, + ./README.TXT, + ./annotate.c, + ./bootstrap.sh, + ./circletexttest.c, + ./config.h.cmake, + ./config.hin, + ./config/Makefile.am, + ./config/gdlib-config.in, + ./config/mkinstalldirs, + ./configure.ac, + ./debian/README.source, + ./debian/TODO, + ./debian/compat, + ./debian/control, + ./debian/control.in, + ./debian/doc_cleaner.pl, + ./debian/gbp.conf, + ./debian/libgd-tools.1, + ./debian/libgd-tools.install, + ./debian/libgd-tools.links, + ./debian/libgd-tools.manpages, + ./debian/libgd2-dev.substvars, + ./debian/libgd2-noxpm-dev.examples, + ./debian/libgd2-noxpm-dev.manpages, + ./debian/libgd2-xpm-dev.examples, + ./debian/libgd2-xpm-dev.manpages, + ./debian/patches/0001_fix_leak_in_gdImageCopyResized.patch, + ./debian/patches/0002_CVE-2009-3546.patch, + ./debian/patches/README, + ./debian/patches/series, + ./debian/source/format, + ./debian/source/local-options, + ./debian/symbols, + ./debian/watch, + ./demoin.png, + ./entities.h, + ./entities.tcl, + ./err.out, + ./fontconfigtest.c, + ./fontsizetest.c, + ./fontwheeltest.c, + ./gd2copypal.c, + ./gd2time.c, + ./gd2togif.c, + ./gd2topng.c, + ./gd_gd.c, + ./gd_gif_in.c, + ./gd_io.c, + ./gd_io.h, + ./gd_io_dp.c, + ./gd_io_file.c, + ./gd_io_ss.c, + ./gd_security.c, + ./gd_ss.c, + ./gdcache.c, + ./gdcache.h, + ./gdcmpgif.c, + ./gddemo.c, + ./gdfontg.c, + ./gdfontg.h, + ./gdfontl.c, + ./gdfontl.h, + ./gdfontmb.c, + ./gdfontmb.h, + ./gdfonts.c, + ./gdfonts.h, + ./gdfontt.c, + ./gdfontt.h, + ./gdfx.h, + ./gdhelpers.c, + ./gdhelpers.h, + ./gdparttopng.c, + ./gdtables.c, + ./gdtest.c, + ./gdtestft.c, + ./gdtopng.c, + ./gdxpm.c, + ./gifanimtest.c, + ./giftogd2.c, + ./install-item, + ./jisx0208.h, + ./mkinstalldirs, + ./netware/get_exp.awk, + ./netware/get_ver.awk, + ./netware/keepscreen.c, + ./netware/nwlibc.c, + ./pngtogd.c, + ./pngtogd2.c, + ./readme.jpn, + ./test/Makefile.am, + ./testac.c, + ./testtr.c, + ./webpng.c, + ./windows/Makefile +Copyright: *No copyright* +License: UNKNOWN + FIXME + +Files: ./config/depcomp, + ./config/missing, + ./depcomp, + ./missing +Copyright: 1996-1997, 1999-2000, 2002 Free Software Foundation, Inc + 1999-2000, Free Software Foundation, Inc +License: GPL + FIXME + +Files: ./Makefile.in, + ./config/Makefile.in, + ./test/Makefile.in +Copyright: 1994-2002 +License: UNKNOWN + FIXME + +Files: ./wbmp.c, + ./wbmp.h +Copyright: 2000, Johan Van den Brande +License: UNKNOWN + FIXME + +Files: ./strlcpy.c +Copyright: 1998, Todd C. Miller +License: BSD (3 clause) + FIXME + +Files: ./debian/rules +Copyright: 2002-2010, Jonas Smedegaard +License: GPL + FIXME + +Files: ./configure +Copyright: (ISLOWER ? 'A' + ( - 'a') : ) + (ISLOWER ? ( | 0x40) : ) + 1992-1996, 1998-2001, + 1996-2007, + 2006, Free Software Foundation, Inc +License: GPL-2+ + FIXME + +Files: ./config/ltmain.sh +Copyright: 1996-2001, 2003-2005 + 2005, Free Software Foundation, Inc." +License: GPL-2+ + FIXME + +Files: ./test/gdtest.gd2 +Copyright: +License: UNKNOWN + FIXME + +Files: ./index.html +Copyright: 1989, Jef + 1990-1991, 1993 + 1994-2004, Cold Spring + 1996-2004, Boutell.Com, Inc + 1999-2004, Greg Roelofs + 1999-2004, John Ellson (ellson@graphviz.org) + 1999-2004, Philip Warner + 2000-2004, Doug Becker and 1994-2004, Thomas G. Lane. This software is based + 2000-2004, Maurice Szmurlo and Johan Van + 2000-2007, Pierre-Alain Joye (pierre@libgd.org) + 2001-2004, John Ellson (ellson@graphviz.org) + 2004, Jaakko Hyvätti (jaakko.hyvatti@iki.fi) + STATEMENT + STATEMENT FOLLOWS THIS LINE + holders disclaim all warranties, either express or implied + statement covers all of the authors +License: UNKNOWN + FIXME + +Files: ./COPYING +Copyright: 1994-1997, + 1994-2001, + 1996-2002, by + 1999-2002, + 1999-2002, Greg + 1999-2002, John + 2000 + 2000-2002, Maurice + 2000-2007, + 2001-2002, John Ellson + holders disclaim +License: UNKNOWN + FIXME + +Files: ./netware/Makefile +Copyright: "$(COPYR)"$(DL) >> $@ + 1996-2007, Boutell.Com, Inc +License: UNKNOWN + FIXME + +Files: ./gd.h +Copyright: ( & 0x0000FF) + (( & 0x00FF00) >> 8) + (( & 0x7F000000) >> 24) + (( & 0xFF0000) >> 16) +License: UNKNOWN + FIXME + +Files: ./gdkanji.c +Copyright: ((c >= 182 && c <= 196) || (c >= 202 && c <= 206) || (c == 179)) + (c >= 202 && c <= 206) +License: UNKNOWN + FIXME + +Files: ./gd.c +Copyright: - (cc)) * (a)) + ((( - (cc)) * (a)) >> 8) + 0x80) >> 8); +License: UNKNOWN + FIXME + +Files: ./gdfx.c +Copyright: + outer_coeff * +License: UNKNOWN + FIXME + +Files: ./bdftogd +Copyright: = $value; } +License: UNKNOWN + FIXME + +Files: ./README-JPEG.TXT +Copyright: 1991-1998, Thomas G. Lane + ACM and IEEE + holder, Aladdin Enterprises of Menlo Park, CA + is the property of + the Free Software Foundation but is freely distributable +License: UNKNOWN + FIXME + +Files: ./gd_jpeg.c +Copyright: 2000, Doug Becker, mailto:thebeckers@home.com +License: UNKNOWN + FIXME + +Files: ./INSTALL +Copyright: 1994-1996, 1999-2002, Free Software +License: UNKNOWN + FIXME + +Files: ./gd_png.c +Copyright: 1999, Greg Roelofs and Thomas Boutell +License: UNKNOWN + FIXME + +Files: ./entities.html +Copyright: International Organization for Standardization 1986, + International Organization for Standardization 1986: + sign, U+00A9 ISOnum --> +License: UNKNOWN + FIXME + +Files: ./gd_gif_out.c +Copyright: 1989, Jef Poskanzer + is the property of +License: UNKNOWN + FIXME + +Files: ./gd_wbmp.c +Copyright: Johan Van den Brande (johan@vandenbrande.com) + Maurice Szmurlo --- T-SIT --- January 2000 +License: UNKNOWN + FIXME + +Files: ./gd_gd2.c +Copyright: 1999, Philip Warner +License: UNKNOWN + FIXME + +Files: ./gdft.c +Copyright: 1997-1998, Sun Microsystems, Inc +License: UNKNOWN + FIXME + +Files: ./windows/libgd.rc +Copyright: 1997-2007, Thomas Boutell, Pierre-Alain Joye and contributors, see COPYING\0" +License: UNKNOWN + FIXME + +Files: ./gd_topal.c +Copyright: 1991-1996, Thomas G. Lane +License: UNKNOWN + FIXME + +Files: ./debian/gdlib-config.1 +Copyright: \(co 1998, Owen Taylor +License: UNKNOWN + FIXME + +Files: ./install-sh +Copyright: 1991, the Massachusetts Institute of Technology +License: UNKNOWN + FIXME + diff -Nru libgd2-2.0.36~rc1~dfsg/debian/gbp.conf libgd2-2.0.36~rc1~dfsg/debian/gbp.conf --- libgd2-2.0.36~rc1~dfsg/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/gbp.conf 2009-11-05 11:05:38.000000000 +0100 @@ -0,0 +1,5 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True +sign-tags = True diff -Nru libgd2-2.0.36~rc1~dfsg/debian/patches/0001_fix_leak_in_gdImageCopyResized.patch libgd2-2.0.36~rc1~dfsg/debian/patches/0001_fix_leak_in_gdImageCopyResized.patch --- libgd2-2.0.36~rc1~dfsg/debian/patches/0001_fix_leak_in_gdImageCopyResized.patch 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/patches/0001_fix_leak_in_gdImageCopyResized.patch 2010-10-17 20:00:04.000000000 +0200 @@ -1,6 +1,10 @@ -diff -ruN libgd2.orig/NEWS libgd2/NEWS ---- libgd2.orig/NEWS 2007-11-27 09:30:34.000000000 +0100 -+++ libgd2/NEWS 2008-03-06 12:42:06.000000000 +0100 +From: Brent Bottles +Subject: Fix leak in gdImageCopyResized +Origin: upstream, http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd.c?r1=1.49.2.24&r2=1.49.2.25 +Bug: http://bugs.libgd.org/145 +Last-Update: 20091105 +--- a/NEWS ++++ b/NEWS @@ -1,6 +1,7 @@ 'GD NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| @@ -9,9 +13,8 @@ 81, Fixed gdImageCopy with true color image, the transparent color was ignored (Pierre, Mark Fisher) 88, Fixed support of PNG grayscale image with alpha channel (Pierre) -diff -ruN libgd2.orig/gd.c libgd2/gd.c ---- libgd2.orig/gd.c 2007-11-27 09:30:34.000000000 +0100 -+++ libgd2/gd.c 2008-03-06 12:42:06.000000000 +0100 +--- a/gd.c ++++ b/gd.c @@ -1,4 +1,4 @@ -/* $Id: gd.c,v 1.49.2.24 2007/11/20 13:42:11 pajoye Exp $ */ +/* $Id: gd.c,v 1.49.2.25 2008/02/01 01:52:25 pajoye Exp $ */ diff -Nru libgd2-2.0.36~rc1~dfsg/debian/patches/0002_CVE-2009-3546.patch libgd2-2.0.36~rc1~dfsg/debian/patches/0002_CVE-2009-3546.patch --- libgd2-2.0.36~rc1~dfsg/debian/patches/0002_CVE-2009-3546.patch 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/patches/0002_CVE-2009-3546.patch 2010-10-17 20:00:04.000000000 +0200 @@ -2,7 +2,7 @@ http://svn.php.net/viewvc?view=revision&revision=289557 --- a/gd_gd.c +++ b/gd_gd.c -@@ -44,6 +44,10 @@ _gdGetColors (gdIOCtx * in, gdImagePtr i +@@ -44,6 +44,10 @@ { goto fail1; } diff -Nru libgd2-2.0.36~rc1~dfsg/debian/README.cdbs-tweaks libgd2-2.0.36~rc1~dfsg/debian/README.cdbs-tweaks --- libgd2-2.0.36~rc1~dfsg/debian/README.cdbs-tweaks 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/README.cdbs-tweaks 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -CDBS tweak -========== - -CDBS is great. In some corner cases, however, some parts of CDBS -sometimes needs a few tweaks to work optimally. - -This is a collection of such tweaks. The goal is for these tweaks to be -absorbed into upstream CDBS. We just haven't found time yet to discuss -them at the CDBS developers' mailinglist. And possible we do not all -agree that the tweaks are so great - therefore this "staging area". - -If you found this file below debian/ subdir in a source package, most -probably only a subset of the below mentioned tweaks are relevant and -have been shipped with the package. The repository of all these tweaks -is here: svn://svn.debian.org/build-common/people/js/overlay/ - -Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/ - - - -New buildinfo rule ------------------- - -See package description for "buildinfo" for more info. - - - -Improved support for multiple compilations ------------------------------------------- - -Create and clean builddir _after_ resolving per-package DEB_BUILDDIR. - -Honour per-package DEB_BUILDDIR in makefile and autotools classes. - -Support multiple build flavors in makefile and autotools classes. - - - -Various improvements to python-distutils class ----------------------------------------------- - -Use full path to Python interpreter (Python Policy section 1.3.2). - -Add CDBS_BUILD_DEPENDS to old policy method. - -Fix CDBS_BUILD_DEPENDS in new policy methods to only depend on debhelper -when actually used. - -Fix DEB_PYTHON_SIMPLE_PACKAGES sometimes installed twice (and only one -of them honouring DEB_PYTHON_COMPILE_VERSION). - -Unify install path using new DEB_PYTHON_DESTDIR. - -Quote install path. - - - -New python-autotools class --------------------------- - -Handle autotools-based Python packaging. - - - -New python-sugar class ----------------------- - -Handle packaging of Sugar activities. - - - -New copyright-check rule ------------------------- - -Refuse to build if the source is found to contain different copyright -info than earlier builds. - - - -New kernelpatches rule ----------------------- - -Small wrapper around dh-kpatches, taking care of build-dependencies too. - - - -New routines for handling upstream tarball ------------------------------------------- - -Rules and variables to help downloading, validating and repackaging -upstream tarball. - -Implements the rules print-version and get-orig-source commonly used -for group-maintained packages with Debian-specific patches maintained in -SVN or some other VCS, and automated fetching virgin upstream tarball -(possibly massaged after download e.g. to strip non-DFSG material). - - - -Support for custom BTS info ---------------------------- - -Include BTS control info found in debian/*.bts files, or alternatively -redirect bug reports to the email address defined in DEB_BTS_EMAIL. - - - -New dict class --------------- - -Rules for packaging ispell, aspell, myspell and wordlist dictionaries. diff -Nru libgd2-2.0.36~rc1~dfsg/debian/README.source libgd2-2.0.36~rc1~dfsg/debian/README.source --- libgd2-2.0.36~rc1~dfsg/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/README.source 2009-11-05 11:05:38.000000000 +0100 @@ -0,0 +1,52 @@ +Building this package for Debian +-------------------------------- + +This source package uses quilt to apply and remove its patches. Please +refer to /usr/share/doc/quilt/README.source for information about how to +use quilt for source packages. + + +Developing this package for Debian +---------------------------------- + +The source of this package is developed using git and the helper tool +git-buildpackage, with all official releases tagged and signed and +binary diffs of tarballs stored using pristine-tar. This is documented +below /usr/share/doc/git-buildpackage/manual-html/ . + +A custom build target shows current upstream and packaging versions: + + debian/rules print-version + +Current upstream tarball can be prepared using this other build target: + + debian/rules get-orig-source + +To switch to newer upstream source, first add a dummy changelog entry +and comment out DEB_UPSTREAM_TARBALL_MD5 before getting the source: + + dch -v ${new_upstream_version}-1 "Dummy changelog entry" + sed -i -e 's/^\(DEB_UPSTREAM_TARBALL_MD5\b\)/#\1/' debian/rules + debian/rules get-orig-source + +Store new md5sum to help ensure identical source is received later. + +Setting DEB_MAINTAINER_MODE=1 enables additional build routines helpful +during development of the package, but unfit for normal builds. This +typically includes the CDBS feature of auto-updating debian/control with +CDBS-related build-dependencies, which is forbidden by Debian Policy as +build environment must not change during automated builds. + + +Maintaining packaging build routines +------------------------------------ + +This source package wraps debhelper commands and other tedious parts of +the build routines using the CDBS framework. Please refer to the actual +makefile snippets included from debian/rules for details on their +purpose and ways to override defaults. Additionally, makefile snippets +included from below /usr/share/cdbs may also be documented in +/usr/share/doc/cdbs/cdbs-doc.pdf.gz . + + + -- Jonas Smedegaard Thu, 26 Feb 2009 21:28:29 +0100 diff -Nru libgd2-2.0.36~rc1~dfsg/debian/rules libgd2-2.0.36~rc1~dfsg/debian/rules --- libgd2-2.0.36~rc1~dfsg/debian/rules 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/rules 2010-10-17 20:00:04.000000000 +0200 @@ -1,16 +1,27 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002-2008 Jonas Smedegaard +# Copyright © 2002-2010 Jonas Smedegaard +# Description: Main Debian packaging script for GD +# +# 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, see . -# NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks DEB_BUILDDIR = build DEB_MAKE_FLAVORS = noxpm xpm -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 debian/cdbs/1/class/autotools.mk -include debian/cdbs/1/rules/buildinfo.mk +include /usr/share/cdbs/1/rules/upstream-tarball.mk +include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk DEB_UPSTREAM_PACKAGE = gd DEB_UPSTREAM_URL = http://www.libgd.org/releases @@ -18,18 +29,19 @@ DEB_UPSTREAM_TARBALL_MD5 = 39ac48e6d5e0012a3bd2248a0102f209 # Upstream source contains copyrights with questionable or missing licenses -DEB_UPSTREAM_REPACKAGE_TAG = dfsg DEB_UPSTREAM_REPACKAGE_EXCLUDE = cmake tests VMS # Avoid copyright-check choking on config/install.sh and aclocal.m4 -DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?|config/install-sh|aclocal\.m4)$ +DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./(demoin\.gif|test/gdtest.*.png|(.*/)?config\.(guess|sub|rpath)(\..*)?|config/install-sh|aclocal\.m4|debian/(changelog|copyright(|_hints|_newhints)))$ pkgname = libgd2 libname = libgd # Install multiple flavors to separate destinations # TODO: drop unneeded pkgname from skel (included to minimize transition patch) -DEB_MAKE_FLAVORS_DESTDIRSKEL = $(CURDIR)/debian/tmp-$(pkgname)-@FLAVOR@ +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp-$(pkgname)-@FLAVOR@ +# TODO: stop setting DEB_DESTDIR when DEB_MAKE_DESTDIRSKEL is actually used +DEB_DESTDIR = $(CURDIR)/debian/tmp-$(pkgname)-$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_noxpm = --without-x --without-xpm --without-fontconfig DEB_CONFIGURE_FLAGS_xpm = --with-x @@ -43,6 +55,24 @@ DEB_SHLIBDEPS_LIBRARY_ALL = -Llibgd2-noxpm -ldebian/libgd2-noxpm/usr/lib +# FIXME: Drop this when CDBS honors per-flavor configure flags +debian/stamp-autotools/noxpm: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_noxpm) +debian/stamp-autotools/xpm: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_xpm) + +# put aside upstream-shipped tempfile during build but after copyright-check +upstreamtmpfiles = test/gdtest_wbmp_to_png.png +pre-build:: debian/stamp-upstreamtmpstuff +debian/stamp-upstreamtmpstuff: debian/stamp-copyright-check + for file in $(upstreamtmpfiles); do \ + [ ! -e $$file ] || [ -e $$file.upstream ] || mv $$file $$file.upstream; \ + done + touch $@ +clean:: + for file in $(upstreamtmpfiles); do \ + [ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \ + done + rm -f debian/stamp-upstreamtmpstuff + # build tests and more _after_ normal build routines common-post-build-arch:: buildmore buildmore: build/libgd2-noxpm @@ -53,7 +83,7 @@ clean:: rm -f README.html README - cd test && rm -f gdtest_wbmp_to_png.png gdtest.jpg gdtest.wbmp + cd test && rm -f gdtest.jpg gdtest.wbmp rm -f demoout.png demooutp.png demoout.gif demooutp.gif rm -rf build debian/tmp-libgd2-noxpm debian/tmp-libgd2-xpm @@ -80,13 +110,10 @@ debian/tmp-$(cdbs_curpkg)/usr/lib/$(libname).so # Needed by upstream for all flavors -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libpng12-dev, libz-dev, libjpeg62-dev +CDBS_BUILD_DEPENDS += , libpng12-dev, libz-dev, libjpeg-dev # Needed by upstream for xpm flavor -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libfreetype6-dev, libxpm-dev, libx11-dev, libxt-dev, libfontconfig-dev +CDBS_BUILD_DEPENDS += , libfreetype6-dev, libxpm-dev, libx11-dev, libxt-dev, libfontconfig-dev # Needed for our packaging -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), d-shlibs (>= 0.30), html2text - -# Fix duplicate cdbs build-dependencies -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' -e 's/^ *, *//' -e 's/ *, *$$//') +CDBS_BUILD_DEPENDS += , d-shlibs, html2text diff -Nru libgd2-2.0.36~rc1~dfsg/debian/source/format libgd2-2.0.36~rc1~dfsg/debian/source/format --- libgd2-2.0.36~rc1~dfsg/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/source/format 2010-10-17 20:00:03.000000000 +0200 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libgd2-2.0.36~rc1~dfsg/debian/TODO libgd2-2.0.36~rc1~dfsg/debian/TODO --- libgd2-2.0.36~rc1~dfsg/debian/TODO 2010-12-12 16:06:53.000000000 +0100 +++ libgd2-2.0.36~rc1~dfsg/debian/TODO 2010-10-17 20:00:04.000000000 +0200 @@ -1,68 +1,79 @@ GD packaging hall of shame: - * Convince these source package to support the noxpm variant of GD2: - + php4 + * Convince these source packages to support the noxpm flavor of GD2: + + enscribe + + ircmarkers + libgd-ruby - + gnustep-gd - + gdtclft - + dvipng - + cl-gd - + apcupsd - + bandwidthd - + mapserver - + cl-gd + + libbio-graphics-perl + + libchart-strip-perl + + libgd-securityimage-perl + + libgd-svg-perl + + libjifty-plugin-chart-perl + m17n-lib - + mrtg + + mapserver + + movabletype-opensource + + mscgen + + nagiosgrapher + + nut + + pdl + php5 - + png2html - + sarg - + bioperl - + ircmarkers - + libchart-strip-perl - + remstats + piwi - For comparison, these source packages correctly support noxpm: - + pygdchart2 (not yet officially released for Debian) - + libgdchart-gd2 - + wims (but there are other problems - see below) - + webdruid - + webalizer - + rscheme + python-gd - + plplot - + ploticus - + nagios - + modlogan - + g2 + + wims + For comparison, these source packages correctly support noxpm: + + analog + + apcupsd + + awffull + + bugzilla + + bandwidthd + bogl - + gnuplot + cvsgraph - + analog - + rrdtool - + enscribe + + dspam + + dvipng + + emboss + + fsl + + fswebcam + + g2 + + ganglia + + gnuplot + graphviz - + ntop - + faqomatic + + lcd4linux + + libauthen-captcha-perl + libchart-perl + + libdata-random-perl + + libdata-stag-perl + + libgd-barcode-perl + + libgd-gd2-noxpm-perl + + libgd-text-perl + + libgdchart-gd2 + + libtemplate-plugin-gd-perl + + libtfbs-perl + + libpuzzle + + mldonkey + + modlogan + + mrtg + + nagios3 + + openvas-client + + ploticus + + plplot + + png2html + + pygdchart2 + + sarg + shanty - + springgraph + + signing-party + + sqlfairy + weathermap4rrd - + bugzilla - And these depend on X11 libs anyway so makes sense to only use -xpm: - + mldonkey - + nut (but why - it is a web app with only CGI interface?!?) - * Convince these source packages to switch to GD v2: - And solve issues with these: - + wims (flydraw and texgd needlessly depends on both v1 and v2) - + libgd-text-perl (needlessly depends on both v1 and v2) - + remstats (favors v1) - For comparison, these source packages correctly depend only on v1: - + libgd-perl (v2 variant packaged too: libgd-gd2-perl) - + libgd-noxpm-perl (v2 variant packaged too: libgd-gd2-noxpm-perl) - + python-gdchart (v2 variant being prepared: pygdchart2) - + libgdchart-gd1 (v2 variant packaged too: libgdchart-gd2) + + webalizer + + webdruid + And these make sense to only use -xpm: + + amule + + embassy-domainatrix + + embassy-domalign + + embassy-domsearch + + embassy-phylip + + libgd-gd2-perl + + pcb + + usplash + + xtartan Post sarge: * Rename the -noxpm packages to -nobloat? - -Related work: - * Adopt libgd-gif and merge with libgd (the gif patent is no more).