Package: vsag Version: 0.1.3 Severity: normal Tags: patch Hi nyu, This patch is from Mark H Weaver to allow customisation of origin, label, suite, and components in the Release file.
I've wrapped it up in a debdiff, and added his name to the (C) lines in the files (hope thats ok). thanks, kk -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686-bigmem (SMP w/2 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages vsag depends on: ii bzip2 1.0.5-6 high-quality block-sorting file co ii dpkg-dev 1.15.8.5 Debian package development tools ii gnupg 1.4.10-4 GNU privacy guard - a free PGP rep ii lzma 4.43-14 Compression method of 7z format in ii make 3.81-8 An utility for Directing compilati vsag recommends no packages. vsag suggests no packages. -- no debconf information
diff -Nru vsag-0.1.2/debian/changelog vsag-0.1.3/debian/changelog --- vsag-0.1.2/debian/changelog 2009-11-23 02:19:44.000000000 +1030 +++ vsag-0.1.3/debian/changelog 2010-11-20 08:31:16.000000000 +1030 @@ -1,3 +1,10 @@ +vsag (0.1.3) unstable; urgency=low + + * Include modifications from Mark H Weaver. Allows customization of several + more fields of the Release file (origin, label, suite, and components). + + -- Karl Goetz <k...@kgoetz.id.au> Sat, 20 Nov 2010 08:24:46 +1030 + vsag (0.1.2) unstable; urgency=low * It's --extra-override, not --extraoverride. diff -Nru vsag-0.1.2/vsag vsag-0.1.3/vsag --- vsag-0.1.2/vsag 2009-05-28 23:56:18.000000000 +0930 +++ vsag-0.1.3/vsag 2010-11-20 08:26:58.000000000 +1030 @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2009 Robert Millan +# Copyright (C) 2010 Mark H Weaver # # 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 @@ -14,13 +15,25 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# +# Modified by Mark H Weaver <m...@netris.org> in 2010 +# to allow customization of several more fields of the Release file +# (origin, label, suite, and components) +# set -e usage () { cat << EOF >&2 -Usage: $0 --release RELEASE --arches ARCHES --description DESCRIPTION --gpg-key GPG-KEY --pkgdir PKGDIR [--override-file OVERRIDES] +Usage: $0 --origin ORIGIN --label LABEL --suite SUITE --version VERSION --components COMPONENTS --release RELEASE --arches ARCHES --description DESCRIPTION --gpg-key GPG-KEY --pkgdir PKGDIR [--override-file OVERRIDES] + ORIGIN is the archive origin (e.g. "Debian") + LABEL is the archive label (e.g. "Debian") + SUITE is the suite these packages are designed for (e.g. "stable") + VERSION is the Debian version (e.g. "6.0") + COMPONENTS is the component list (e.g. "main") RELEASE is the target release name (e.g. "lenny") ARCHES is a space-separated list of architectures (e.g. "i386 amd64") DESCRIPTION is a human-readable description (e.g. "This is my archive") @@ -43,6 +56,26 @@ usage exit 0 ;; + --origin) + shift + export origin="$1" + ;; + --label) + shift + export label="$1" + ;; + --suite) + shift + export suite="$1" + ;; + --version) + shift + export version="$1" + ;; + --components) + shift + export components="$1" + ;; --release) shift export release="$1" diff -Nru vsag-0.1.2/vsag.mk vsag-0.1.3/vsag.mk --- vsag-0.1.2/vsag.mk 2009-11-23 02:19:09.000000000 +1030 +++ vsag-0.1.3/vsag.mk 2010-11-20 08:30:22.000000000 +1030 @@ -1,5 +1,6 @@ # # Copyright (C) 2009 Robert Millan +# Copyright (C) 2010 Mark H Weaver # # 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 @@ -14,6 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Modified by Mark H Weaver <m...@netris.org> in 2010 +# to allow customization of several more fields of the Release file +# (origin, label, suite, and components) +# + SHELL = bash dpkg_scanpackages = dpkg-scanpackages @@ -71,14 +78,14 @@ # FIXME: some of these still need to be made configurable, but which # ones actually matter? - (echo "Origin: Debian" ; \ - echo "Label: Debian" ; \ - echo "Suite: stable" ; \ + (echo "Origin: $(origin)" ; \ + echo "Label: $(label)" ; \ + echo "Suite: $(suite)" ; \ echo "Codename: $(release)" ; \ - echo "Date: Fri, 09 Jan 2009 08:32:38 UTC" ; \ - echo "Valid-Until: Fri, 16 Jan 2099 08:32:38 UTC" ; \ + echo "Date: `date --utc '+%a, %d %b %Y %k:%M:%S %Z'`" ; \ + echo "Valid-Until: `date --utc --date='1 year' '+%a, %d %b %Y %k:%M:%S %Z'`" ; \ echo "Architectures: $(arches)" ; \ - echo "Components: main" ; \ + echo "Components: $(components)" ; \ echo "Description: $(description)") > $@ echo "MD5Sum:" >> $@ @@ -101,11 +108,11 @@ $(foreach arch, $(arches), dists/$(release)/main/binary-$(arch)/Release dists/$(release)/main/debian-installer/binary-$(arch)/Release): for arch in $(arches) ; do \ mkdir -p dists/$(release)/main/{debian-installer/,}binary-$$arch ; \ - (echo "Archive: stable" ; \ - echo "Version: 5.0" ; \ + (echo "Archive: $(suite)" ; \ + echo "Version: $(version)" ; \ echo "Component: main" ; \ - echo "Origin: Debian" ; \ - echo "Label: Debian" ; \ + echo "Origin: $(origin)" ; \ + echo "Label: $(label)" ; \ echo "Architecture: $$arch") \ | tee dists/$(release)/main/binary-$$arch/Release \ > dists/$(release)/main/debian-installer/binary-$$arch/Release ; \ @@ -113,11 +120,11 @@ dists/$(release)/main/source/Release: mkdir -p `dirname $...@` - (echo "Archive: stable" ; \ - echo "Version: 5.0" ; \ + (echo "Archive: $(suite)" ; \ + echo "Version: $(version)" ; \ echo "Component: main" ; \ - echo "Origin: Debian" ; \ - echo "Label: Debian" ; \ + echo "Origin: $(origin)" ; \ + echo "Label: $(label)" ; \ echo "Architecture: source") \ > dists/$(release)/main/source/Release
