r41516 - in /trunk/libcgi-ssi-perl/debian: changelog compat control patches/series rules

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Sat Aug 8 14:50:32 UTC 2009


Author: diocles-guest
Date: Sat Aug  8 14:50:26 2009
New Revision: 41516

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41516
Log:
  * Use short format dh7/quilt rules file.
  * Add quilt series file and debhelper compat file.
  * debian/control:
    + Remove yada, add debhelper/quilt to build dependencies.

Added:
    trunk/libcgi-ssi-perl/debian/compat
    trunk/libcgi-ssi-perl/debian/patches/series
Modified:
    trunk/libcgi-ssi-perl/debian/changelog
    trunk/libcgi-ssi-perl/debian/control
    trunk/libcgi-ssi-perl/debian/rules

Modified: trunk/libcgi-ssi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-ssi-perl/debian/changelog?rev=41516&op=diff
==============================================================================
--- trunk/libcgi-ssi-perl/debian/changelog (original)
+++ trunk/libcgi-ssi-perl/debian/changelog Sat Aug  8 14:50:26 2009
@@ -14,6 +14,12 @@
     <dexter at debian.org>); Piotr Roszatycki <dexter at debian.org> moved to
     Uploaders.
   * debian/watch: use dist-based URL.
+
+  [ Tim Retout ]
+  * Use short format dh7/quilt rules file.
+  * Add quilt series file and debhelper compat file.
+  * debian/control:
+    + Remove yada, add debhelper/quilt to build dependencies.
 
  -- Damyan Ivanov <dmn at debian.org>  Wed, 17 Sep 2008 22:22:23 +0300
 

Added: trunk/libcgi-ssi-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-ssi-perl/debian/compat?rev=41516&op=file
==============================================================================
--- trunk/libcgi-ssi-perl/debian/compat (added)
+++ trunk/libcgi-ssi-perl/debian/compat Sat Aug  8 14:50:26 2009
@@ -1,0 +1,1 @@
+7

Modified: trunk/libcgi-ssi-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-ssi-perl/debian/control?rev=41516&op=diff
==============================================================================
--- trunk/libcgi-ssi-perl/debian/control (original)
+++ trunk/libcgi-ssi-perl/debian/control Sat Aug  8 14:50:26 2009
@@ -7,7 +7,7 @@
 Homepage: http://search.cpan.org/dist/CGI-SSI/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcgi-ssi-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libcgi-ssi-perl/
-Build-Depends: yada (>= 0.53)
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
 Build-Depends-Indep: perl (>= 5.8), tofrodos, libhtml-simpleparse-perl, perl-modules, libwww-perl, liburi-perl, libtimedate-perl
 
 Package: libcgi-ssi-perl

Added: trunk/libcgi-ssi-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-ssi-perl/debian/patches/series?rev=41516&op=file
==============================================================================
--- trunk/libcgi-ssi-perl/debian/patches/series (added)
+++ trunk/libcgi-ssi-perl/debian/patches/series Sat Aug  8 14:50:26 2009
@@ -1,0 +1,1 @@
+010-test_without_network.patch

Modified: trunk/libcgi-ssi-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcgi-ssi-perl/debian/rules?rev=41516&op=diff
==============================================================================
--- trunk/libcgi-ssi-perl/debian/rules (original)
+++ trunk/libcgi-ssi-perl/debian/rules Sat Aug  8 14:50:26 2009
@@ -1,248 +1,4 @@
 #!/usr/bin/make -f
-# Generated automatically from debian/packages
-# by yada v0.53, of Fri,  4 May 2007
 
-DEB_HOST_ARCH        := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-DEB_HOST_ARCH_OS     := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-DEB_HOST_ARCH_CPU    := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_GNU_CPU     := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU 2>/dev/null)
-DEB_HOST_GNU_TYPE    := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2>/dev/null)
-DEB_HOST_GNU_SYSTEM  := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
-
-DEB_BUILD_ARCH       := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
-DEB_BUILD_ARCH_OS    := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
-DEB_BUILD_ARCH_CPU   := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
-DEB_BUILD_GNU_CPU    := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU 2>/dev/null)
-DEB_BUILD_GNU_TYPE   := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2>/dev/null)
-DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM 2>/dev/null)
-
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
-  DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
-  ifeq ($(DEB_HOST_ARCH_CPU),i486)
-    DEB_HOST_ARCH_OS := i386
-  else
-  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
-    DEB_HOST_ARCH_OS := amd64
-  endif
-  endif
-endif
-ifeq ($(DEB_HOST_ARCH_OS),)
-  DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
-  ifeq ($(DEB_HOST_ARCH_OS),gnu)
-    DEB_HOST_ARCH_OS := hurd
-  endif
-endif
-ifeq ($(DEB_BUILD_ARCH_CPU),)
-  DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
-  ifeq ($(DEB_BUILD_ARCH_CPU),i486)
-    DEB_BUILD_ARCH_OS := i386
-  else
-  ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
-    DEB_BUILD_ARCH_OS := amd64
-  endif
-  endif
-endif
-ifeq ($(DEB_BUILD_ARCH_OS),)
-  DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
-  ifeq ($(DEB_BUILD_ARCH_OS),gnu)
-    DEB_BUILD_ARCH_OS := hurd
-  endif
-endif
-
-LEFT_PARENTHESIS:=(
-VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]* $(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
-
-SHELL=/bin/bash
-
-.PHONY: default
-default:
-	@echo "Specify a target:"; \
-	echo " build              compile the package"; \
-	echo " build-arch         compile the architecture-dependent package"; \
-	echo " build-indep        compile the architecture-independent package"; \
-	echo " binary             make all binary packages"; \
-	echo " binary-arch        make all architecture-dependent binary packages"; \
-	echo " binary-indep       make all architecture-independent binary packages"; \
-	echo " clean              clean up the source package"; \
-	echo; \
-	echo " clean-install-tree clean up only under debian/"; \
-	echo
-
-# Build the package and prepare the install tree
-
-.PHONY: build-only build
-build-only: debian/build-stamp
-build: build-only
-
-.PHONY: build-arch-only build-arch
-build-arch-only: debian/build-arch-stamp
-build-arch: build-arch-only
-
-.PHONY: build-indep-only build-indep
-build-indep-only: debian/build-indep-stamp
-build-indep: build-indep-only
-
-# Make sure these rules and the control file are up-to-date
-
-.PHONY: rules control templates
-rules: debian/rules
-debian/rules: $(shell which yada) debian/packages-tmp
-	yada rebuild rules
-
-control: debian/control
-debian/control: $(shell which yada) debian/packages-tmp
-	yada rebuild control
-
-templates: debian/templates debian/po/POTFILES.in
-debian/templates: $(shell which yada) debian/packages-tmp
-	yada rebuild templates
-debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
-	yada rebuild templates
-
-debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	yada patch "debian/patches/*.patch"
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export SOURCE="libcgi-ssi-perl" \
-	  && export VERSION="$(VERSION)" \
-	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
-	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
-	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
-	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'PERL=$${PERL:-/usr/bin/perl}';\
-	echo -E '$$PERL Makefile.PL INSTALLDIRS=vendor';\
-	echo -E 'make';\
-	echo -E 'find blib -name '\''*.pm'\'' -print0 | xargs -0 fromdos -v -f';\
-	echo -E 'find blib -name '\''*.pm'\'' -print0 | xargs -0 chmod -v -x';\
-	echo -E 'make test') | /bin/sh
-	touch debian/build-stamp
-
-debian/build-arch-stamp:
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	yada patch "debian/patches/*.patch"
-	touch debian/build-arch-stamp
-
-debian/build-indep-stamp: debian/build-arch-stamp
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	yada patch "debian/patches/*.patch"
-	touch debian/build-indep-stamp
-
-.PHONY: install-tree
-install-tree: install-tree-any
-install-tree-any: \
-	debian/tmp-libcgi-ssi-perl/DEBIAN/control
-
-debian/tmp-libcgi-ssi-perl/DEBIAN/control: debian/build-stamp debian/control
-	rm -rf debian/tmp-libcgi-ssi-perl
-	umask 022 && install -d debian/tmp-libcgi-ssi-perl/DEBIAN
-	install -d debian/tmp-libcgi-ssi-perl/usr/share/doc/libcgi-ssi-perl
-	umask 022; yada generate copyright \
-	  > debian/tmp-libcgi-ssi-perl/usr/share/doc/libcgi-ssi-perl/copyright
-	install -m 644 -p debian/changelog \
-	  debian/tmp-libcgi-ssi-perl/usr/share/doc/libcgi-ssi-perl/changelog.Debian
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export ROOT="$$(pwd)/debian/tmp-libcgi-ssi-perl" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export CONTROL="$$(pwd)/debian/tmp-libcgi-ssi-perl/DEBIAN" \
-	  && export PACKAGE="libcgi-ssi-perl" \
-	  && export SOURCE="libcgi-ssi-perl" \
-	  && export VERSION="$(VERSION)" \
-	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
-	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
-	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
-	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'PERL=$${PERL:-/usr/bin/perl}';\
-	echo -E 'make install PREFIX=$$ROOT/usr';\
-	echo -E 'yada install -doc README';\
-	echo -E 'yada install -doc -as changelog Changes') | /bin/sh
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export ROOT="$$(pwd)/debian/tmp-libcgi-ssi-perl" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export CONTROL="$$(pwd)/debian/tmp-libcgi-ssi-perl/DEBIAN" \
-	  && export PACKAGE="libcgi-ssi-perl" \
-	  && export SOURCE="libcgi-ssi-perl" \
-	  && export VERSION="$(VERSION)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'yada perl';\
-	echo -E 'yada python';\
-	echo -E 'yada strip';\
-	echo -E 'yada shlibdeps') | /bin/sh
-	yada compress libcgi-ssi-perl
-	yada generate maintscripts libcgi-ssi-perl
-	find debian/tmp-libcgi-ssi-perl -type f -print \
-	  | sed -n 's/^debian\/tmp-libcgi-ssi-perl\(\/etc\/.*\)$$/\1/p' \
-	  > debian/tmp-libcgi-ssi-perl/DEBIAN/conffiles
-	test -s debian/tmp-libcgi-ssi-perl/DEBIAN/conffiles || rm -f debian/tmp-libcgi-ssi-perl/DEBIAN/conffiles
-	yada rebuild control
-	yada generate substvars libcgi-ssi-perl
-	umask 022 && dpkg-gencontrol -isp -plibcgi-ssi-perl -Pdebian/tmp-libcgi-ssi-perl
-
-# Build package files
-
-.PHONY: binary binary-arch binary-indep
-binary: binary-arch binary-indep
-binary-arch: binary-arch-any
-
-.PHONY: binary-arch-any
-binary-arch-any:
-binary-indep: \
-	binary-package-libcgi-ssi-perl
-
-.PHONY: binary-package-libcgi-ssi-perl
-binary-package-libcgi-ssi-perl: check-root debian/tmp-libcgi-ssi-perl/DEBIAN/control
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	chown -R 0.0 debian/tmp-libcgi-ssi-perl
-	chmod -R u=rwX,go=rX debian/tmp-libcgi-ssi-perl
-	@if [ -d debian/tmp-libcgi-ssi-perl/usr/doc/libcgi-ssi-perl ]; then \
-	  echo "*** Yada warning: /usr/doc/libcgi-ssi-perl should be /usr/share/doc/libcgi-ssi-perl";\
-	fi
-	dpkg-deb --build debian/tmp-libcgi-ssi-perl ..
-
-.PHONY: check-root
-check-root:
-	@[ `id -u` = 0 ] || (echo "You must be root to do this!"; false)
-
-debian/packages-tmp: debian/packages 
-	yada rebuild packages
-
-## Clean up afterwards
-
-.PHONY: clean clean-install-tree clean-build
-
-clean: clean-install-tree clean-build debian/control debian/rules
-	rm -f debian/packages-tmp debian/packages-tmp-new debian/packages-tmp-include
-
-clean-build:
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	rm -f debian/build-stamp debian/build-arch-stamp debian/build-indep-stamp
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export SOURCE="libcgi-ssi-perl" \
-	  && export VERSION="$(VERSION)" \
-	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
-	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
-	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
-	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'test -f Makefile && touch Makefile && make distclean || true') | /bin/sh
-	yada unpatch
-	rm -rf debian/tmp
-
-clean-install-tree: debian/rules
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	rm -f debian/install-tree-stamp
-	rm -rf debian/tmp-* debian/files* debian/substvars debian/shlibs.local debian/ucf
+%:
+	dh --with quilt $@




More information about the Pkg-perl-cvs-commits mailing list