Hi, The attached file is the diff for my gtm 0.4.12+cvs20031024-4 QA upload. This upload fixes 1 release goal bug. The associated changelog entry is:
gtm (0.4.12+cvs20031024-4) unstable; urgency=medium
* QA upload.
* Adapt quilt patch system
- Remove "manual" patch target from debian/rules (Closes: #477582)
* debian/rules:
- General tidying
- Don't use -j2 by default
- Update outdated config.{sub,guess} in clean target
* debian/control:
- Bump Standards-Version to 3.8.0
- Add ${misc:Depends} substvar for "gtm" binary package
- Add Build-Depends on autotools-dev and quilt
* Move documentation from "Apps/Net" section to "Network/File Transfer"
The .dsc is available here:
http://chris-lamb.co.uk/debian/qa/gtm_0.4.12%2Bcvs20031024-4.dsc
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -Nru gtm-0.4.12+cvs20031024/debian/changelog
gtm-0.4.12+cvs20031024/debian/changelog
--- gtm-0.4.12+cvs20031024/debian/changelog 2008-06-09 00:47:39.000000000
+0100
+++ gtm-0.4.12+cvs20031024/debian/changelog 2008-06-09 00:47:39.000000000
+0100
@@ -1,3 +1,20 @@
+gtm (0.4.12+cvs20031024-4) unstable; urgency=medium
+
+ * QA upload.
+ * Adapt quilt patch system
+ - Remove "manual" patch target from debian/rules (Closes: #477582)
+ * debian/rules:
+ - General tidying
+ - Don't use -j2 by default
+ - Update outdated config.{sub,guess} in clean target
+ * debian/control:
+ - Bump Standards-Version to 3.8.0
+ - Add ${misc:Depends} substvar for "gtm" binary package
+ - Add Build-Depends on autotools-dev and quilt
+ * Move documentation from "Apps/Net" section to "Network/File Transfer"
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Mon, 09 Jun 2008 00:14:05 +0100
+
gtm (0.4.12+cvs20031024-3) unstable; urgency=low
* Orphaned.
diff -Nru gtm-0.4.12+cvs20031024/debian/control
gtm-0.4.12+cvs20031024/debian/control
--- gtm-0.4.12+cvs20031024/debian/control 2008-06-09 00:47:39.000000000
+0100
+++ gtm-0.4.12+cvs20031024/debian/control 2008-06-09 00:47:39.000000000
+0100
@@ -2,13 +2,12 @@
Section: gnome
Priority: optional
Maintainer: Debian QA Group <[EMAIL PROTECTED]>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.0), liborbit2-dev, intltool, wget,
- libgnomevfs2-dev, libgconf2-dev, libgnomeui-dev (>= 2.4.0)
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5.0), quilt, liborbit2-dev, intltool, wget,
libgnomevfs2-dev, libgconf2-dev, libgnomeui-dev (>= 2.4.0), autotools-dev
Package: gtm
Architecture: any
-Depends: ${shlibs:Depends}, wget (>= 1.8.1)
+Depends: ${shlibs:Depends}, ${misc:Depends} wget (>= 1.8.1)
Suggests: menu (>= 1.5)
Description: Multiple files transfer manager
GTransferManager allows the user to retrieve multiple files from the web.
diff -Nru gtm-0.4.12+cvs20031024/debian/doc-base
gtm-0.4.12+cvs20031024/debian/doc-base
--- gtm-0.4.12+cvs20031024/debian/doc-base 2008-06-09 00:47:39.000000000
+0100
+++ gtm-0.4.12+cvs20031024/debian/doc-base 2008-06-09 00:47:39.000000000
+0100
@@ -2,7 +2,7 @@
Title: GTransferManager user's manual.
Author: Bruno Pires Marinho <[EMAIL PROTECTED]>
Abstract: This manual describes how to use gtm.
-Section: Apps/Net
+Section: Network/File Transfer
Format: HTML
Index: /usr/share/doc/gtm/html/gtm/C/index.html
diff -Nru gtm-0.4.12+cvs20031024/debian/menu gtm-0.4.12+cvs20031024/debian/menu
--- gtm-0.4.12+cvs20031024/debian/menu 2008-06-09 00:47:39.000000000 +0100
+++ gtm-0.4.12+cvs20031024/debian/menu 2008-06-09 00:47:39.000000000 +0100
@@ -1,6 +1,6 @@
?package(gtm):needs="X11" \
hints="Gnome" \
- section="Apps/Net" \
+ section="Applications/Network/File Transfer" \
title="gtm" \
longtitle="Controls the transfer of web files" \
icon="/usr/share/pixmaps/gtm.xpm" \
diff -Nru gtm-0.4.12+cvs20031024/debian/patches/01-manpage.diff
gtm-0.4.12+cvs20031024/debian/patches/01-manpage.diff
--- gtm-0.4.12+cvs20031024/debian/patches/01-manpage.diff 1970-01-01
01:00:00.000000000 +0100
+++ gtm-0.4.12+cvs20031024/debian/patches/01-manpage.diff 2008-06-09
00:47:39.000000000 +0100
@@ -0,0 +1,85 @@
+
+ We rerun docbook-to-man on doc/gtm.1 to remove formatting errors introduced
+ by an old version of docbook-to-man.
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Mon, 09 Jun 2008 00:14:05 +0100
+
+--- a/doc/gtm.1.orig 2008-06-09 00:33:54.000000000 +0100
++++ b/doc/gtm.1 2008-06-09 00:32:11.000000000 +0100
+@@ -1,68 +1,13 @@
+-.\" This -*- nroff -*- file has been generated from
+-.\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
+-...\"
+-...\" transcript compatibility for postscript use.
+-...\"
+-...\" synopsis: .P! <file.ps>
+-...\"
+-.de P!
+-\\&.
+-.fl \" force out current output buffer
+-\\!%PB
+-\\!/showpage{}def
+-...\" the following is from Ken Flowers -- it prevents dictionary overflows
+-\\!/tempdict 200 dict def tempdict begin
+-.fl \" prolog
+-.sy cat \\$1\" bring in postscript file
+-...\" the following line matches the tempdict above
+-\\!end % tempdict %
+-\\!PE
+-\\!.
+-.sp \\$2u \" move below the image
+-..
+-.de pF
+-.ie \\*(f1 .ds f1 \\n(.f
+-.el .ie \\*(f2 .ds f2 \\n(.f
+-.el .ie \\*(f3 .ds f3 \\n(.f
+-.el .ie \\*(f4 .ds f4 \\n(.f
+-.el .tm ? font overflow
+-.ft \\$1
+-..
+-.de fP
+-.ie !\\*(f4 \{\
+-. ft \\*(f4
+-. ds f4\"
+-' br \}
+-.el .ie !\\*(f3 \{\
+-. ft \\*(f3
+-. ds f3\"
+-' br \}
+-.el .ie !\\*(f2 \{\
+-. ft \\*(f2
+-. ds f2\"
+-' br \}
+-.el .ie !\\*(f1 \{\
+-. ft \\*(f1
+-. ds f1\"
+-' br \}
+-.el .tm ? font underflow
+-..
+-.ds f1\"
+-.ds f2\"
+-.ds f3\"
+-.ds f4\"
+-'\" t
+-.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ .TH "GTM" "1"
+ .SH "NAME"
+ gtm \(em allows the user to retrieve multiple files from the
+ internet.
+ .SH "SYNOPSIS"
+ .PP
+-\fBgtm\fP [\fB-g\fP] [\fB--get-url\fP\fI[=URL]\fP]
++\fBgtm\fR [\fB-g\fP] [\fB\-\-get-url\fP\fI[=URL]\fR]
+ .SH "DESCRIPTION"
+ .PP
+-\fBgtm\fP (GTransferManager) allows the user to retrieve
++\fBgtm\fR (GTransferManager) allows the user to retrieve
+ multiple files from the internet. These files can be retrieved in
+ multiple parts and each part retrieved on a separate session that the
+ user is connected to the internet. This is most useful to users with
+@@ -75,4 +20,4 @@
+ .PP
+ This manual page was written by Christian Marillat [EMAIL PROTECTED] for
+ the \fBDebian GNU/Linux\fP system (but may be used by others).
+-...\" created by instant / docbook-to-man, Wed 28 Mar 2001, 12:12
++.\" created by instant / docbook-to-man, Mon 09 Jun 2008, 00:32
diff -Nru gtm-0.4.12+cvs20031024/debian/patches/series
gtm-0.4.12+cvs20031024/debian/patches/series
--- gtm-0.4.12+cvs20031024/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ gtm-0.4.12+cvs20031024/debian/patches/series 2008-06-09
00:47:39.000000000 +0100
@@ -0,0 +1 @@
+01-manpage.diff
diff -Nru gtm-0.4.12+cvs20031024/debian/rules
gtm-0.4.12+cvs20031024/debian/rules
--- gtm-0.4.12+cvs20031024/debian/rules 2008-06-09 00:47:39.000000000 +0100
+++ gtm-0.4.12+cvs20031024/debian/rules 2008-06-09 00:47:39.000000000 +0100
@@ -2,6 +2,8 @@
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -14,34 +16,27 @@
endif
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
-
./configure --prefix=/usr --sysconfdir=/etc --enable-ssl \
--mandir=\$${prefix}/share/man --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --disable-applet CFLAGS="$(CFLAGS)"
-
- touch configure-stamp
+ touch $@
build: configure-stamp build-stamp
build-stamp:
dh_testdir
+ $(MAKE)
+ touch $@
- $(MAKE) -j 2
-
- touch build-stamp
-
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
+ -test -r /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub
config.sub
+ -test -r /usr/share/misc/config.guess && cp -f
/usr/share/misc/config.guess config.guess
[ ! -f Makefile ] || $(MAKE) distclean
-
- -find -name gtm.junk | xargs rm -rf
-
- debian/rules unpatch
-
+ find -name gtm.junk | xargs rm -rf
dh_clean applet/Makefile
install: build
@@ -55,16 +50,14 @@
mv debian/gtm/usr/share/gnome/help/gtm debian/gtm/usr/share/doc/gtm/html
-# Remove applet manpage
+ # Remove applet manpage
rm debian/gtm/usr/share/man/man1/gtm_applet.1
-# Install Debian icon menu
+ # Install Debian icon menu
cp debian/gtm.xpm debian/gtm/usr/share/pixmaps
-# Build architecture-independent files here.
binary-indep: build install
-# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
@@ -82,68 +75,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch
unpatch
-
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DPATCH_ARCH := ${DEB_BUILD_ARCH}
-PATCHLIST_ALL = $(shell test -f debian/patches/00list && grep -v ^\#
debian/patches/00list)
-PATCHLIST_ARCH = $(shell test -f debian/patches/00list.${DPATCH_ARCH} && grep
-v ^\# debian/patches/00list.${DPATCH_ARCH})
-PATCHLIST ?= $(shell echo ${PATCHLIST_ALL} ${PATCHLIST_ARCH})
-
-UNPATCHLIST = $(shell echo ${PATCHLIST} | tr ' ' '\n' | tac)
-
-# Expand them right now
-PATCHLIST := ${PATCHLIST}
-UNPATCHLIST := ${UNPATCHLIST}
-
-patch: patch-stamp
-patch-stamp:
- test -d debian/patched || install -d debian/patched
- @echo "Patches applied in the Debian version of ${PACKAGE}:" > [EMAIL
PROTECTED]
- @for patch in ${PATCHLIST}; do \
- patchdir=$${patch%/*}; \
- test "x$$patchdir" = "x$$patch" || \
- install -d debian/patched/$$patchdir; \
- stamp=debian/patched/$${patch%%.dpatch}.dpatch; \
- test -e debian/patches/$$patch || ext=.dpatch; \
- patch=debian/patches/$$patch$$ext; \
- author=`sed -n "s,^#* *.*dpatch by *,,p" $$patch`; \
- test -x $$patch || chmod +x $$patch; \
- if test -f $$stamp; then \
- echo "$$patch already applied."; \
- echo -e "\n$$patch ($$author):" >> [EMAIL PROTECTED]; \
- sed -n 's/^#* *DP: */ /p' $$patch >> [EMAIL
PROTECTED]; \
- else \
- echo -n "applying patch $$patch..."; \
- if $$patch -patch >$$stamp.new 2>&1; then \
- mv $$stamp.new $$stamp; \
- touch $$stamp; \
- echo -e "\n$$patch ($$author):" >> [EMAIL
PROTECTED]; \
- sed -n 's/^#* *DP: */ /p' $$patch >> [EMAIL
PROTECTED]; \
- echo " ok."; \
- else \
- echo " failed."; \
- exit 1; \
- fi; \
- fi; \
- done
- mv -f [EMAIL PROTECTED] $@
-
-unpatch:
- @for patch in ${UNPATCHLIST}; do \
- stamp=debian/patched/$${patch%%.dpatch}.dpatch; \
- test -e debian/patches/$$patch || ext=.dpatch; \
- patch=debian/patches/$$patch$$ext; \
- test -x $$patch || chmod +x $$patch; \
- if test -f $$stamp; then \
- echo -n "reverting patch $$patch..."; \
- if $$patch -unpatch 2>&1 >/dev/null; then \
- rm -f $$stamp; \
- echo " ok."; \
- else \
- echo " failed."; \
- exit 1; \
- fi; \
- fi; \
- done
- rm -rf patch-stamp patch-stampT debian/patched
+.PHONY: build clean binary-indep binary-arch binary install configure
signature.asc
Description: PGP signature
