Import Debian changes 0.6.5-2 debian/0.6.5-2
authorRichard Atterer <atterer@debian.org>
Thu, 19 Dec 2002 14:44:31 +0000 (15:44 +0100)
committerSteve McIntyre <steve@einval.com>
Thu, 24 Oct 2019 10:34:57 +0000 (11:34 +0100)
jigdo (0.6.5-2) stable; urgency=low

  * Backported some changes from 0.6.8 to stable:
  * Relative template URLs allowed, closes: #149885
  * jigdo-lite/mirror use "jigdo-file --no-cache" when reading
    downloaded files from tmp dir, closes: #150973

jigdo (0.6.5-1) unstable; urgency=medium

  * New upstream release

jigdo (0.6.4-1) unstable; urgency=medium

  * New upstream release

jigdo (0.6.3-1) unstable; urgency=medium

  * New upstream release
  * Fixes build problems on 64-bit machines, closes: #133533

jigdo (0.6.2-2) unstable; urgency=medium

  * Unversioned dependency on wget, to allow wget-ssl to be used
    instead of wget. Closes: #132903, #133008

jigdo (0.6.2-1) unstable; urgency=low

  * Initial Release.

Makefile.in
debian/changelog [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/jigdo-file.docs [new file with mode: 0644]
debian/rules [new file with mode: 0755]
scripts/jigdo-lite

index eb36f1c..98be276 100644 (file)
@@ -101,8 +101,8 @@ install-jigdo:
                $(INSTALL_DATA) "$(srcdir)/COPYING" \
                    "$(DESTDIR)$(datadir)/jigdo/COPYING"
 install-po:
-               @test "$(catalogs)" \
-                && for file in $(catalogs); do \
+               @if test "$(catalogs)"; then \
+                for file in $(catalogs); do \
                    lang=`echo $$file | sed -e 's/\.gmo$$//'`; \
                    dir="$(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES"; \
                    echo "$(INSTALL) -d \"$$dir\""; \
@@ -112,7 +112,7 @@ install-po:
                    echo "$(INSTALL_DATA) $$s \"$$dir/$(PACKAGE).mo\""; \
                    $(INSTALL_DATA) "$$s" "$$dir/$(PACKAGE).mo" \
                        || exit 1; \
-               done
+               done; fi
 
 Makefile:      Makefile.in configure VERSION
                sh config.status # update Makefile from Makefile.in
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..5d8c9ce
--- /dev/null
@@ -0,0 +1,41 @@
+jigdo (0.6.5-2) stable; urgency=low
+
+  * Backported some changes from 0.6.8 to stable:
+  * Relative template URLs allowed, closes: #149885
+  * jigdo-lite/mirror use "jigdo-file --no-cache" when reading
+    downloaded files from tmp dir, closes: #150973
+
+ -- Richard Atterer <atterer@debian.org>  Thu, 19 Dec 2002 15:44:31 +0100
+
+jigdo (0.6.5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Richard Atterer <atterer@debian.org>  Wed, 17 Apr 2002 15:12:01 +0200
+
+jigdo (0.6.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Richard Atterer <atterer@debian.org>  Fri,  1 Mar 2002 23:52:44 +0100
+
+jigdo (0.6.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Fixes build problems on 64-bit machines, closes: #133533
+
+ -- Richard Atterer <atterer@debian.org>  Sat, 23 Feb 2002 22:08:17 +0100
+
+jigdo (0.6.2-2) unstable; urgency=medium
+
+  * Unversioned dependency on wget, to allow wget-ssl to be used
+    instead of wget. Closes: #132903, #133008
+
+ -- Richard Atterer <atterer@debian.org>  Sat,  9 Feb 2002 18:25:22 +0100
+
+jigdo (0.6.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Richard Atterer <atterer@debian.org>  Mon,  4 Feb 2002 17:54:16 +0100
+
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..dc481f2
--- /dev/null
@@ -0,0 +1,29 @@
+Source: jigdo
+Section: utils
+Priority: extra
+Maintainer: Richard Atterer <atterer@debian.org>
+Build-Depends: debhelper (>= 2.0.86), zlib1g-dev, libdb3-dev
+Standards-Version: 3.5.6
+
+Package: jigdo-file
+Architecture: any
+Depends: wget, ${shlibs:Depends}
+Description: Download Debian CD images from any Debian mirror
+ Using the jigdo-lite script contained in this package, you can use
+ your nearest "regular" Debian mirror to download Debian CD images,
+ instead of having to use one of the few, slow, overloaded mirrors
+ that offer the images as direct HTTP or FTP downloads. See
+ <http://www.debian.org/CD/jigdo-cd/> for details.
+ .
+ Jigsaw Download, or short jigdo, is a scheme developed primarily to
+ make it easy to distribute huge filesystem images (e.g. CD (ISO9660)
+ or DVD (UDF) images) over the internet, but it could also be used for
+ other data which is awkward to handle due to its size, like
+ audio/video files or large software packages.
+ .
+ jigdo tries to ensure that the large file is downloaded in small
+ parts which can be stored on different servers. People who want to
+ download the image do so by telling the jigdo download tool to
+ process one ".jigdo" file; using it, jigdo downloads the parts and
+ reassembles the image. jigdo-file is used to prepare the files for
+ download.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..f7c6b59
--- /dev/null
@@ -0,0 +1,20 @@
+Copyright (C) 2001-2002 Richard Atterer <richard@atterer.net>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  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.
+
+Please note: The copyright notice in the file COPYING only applies to
+the text of the GNU General Public License; the copyright of the
+individual source files is as specified at the top of each file and
+above. Also note that the code is licensed under GPL _version_2_ and
+no other version. Special licensing for my (RA's) code is available on
+request.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/jigdo-file.docs b/debian/jigdo-file.docs
new file mode 100644 (file)
index 0000000..6d10dce
--- /dev/null
@@ -0,0 +1 @@
+changelog
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..0816f6d
--- /dev/null
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=2
+
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+       ./configure --prefix=/usr --disable-nls --without-gui \
+           --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+       touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+       dh_testdir
+       $(MAKE)
+       touch build-stamp
+
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+       -$(MAKE) distclean
+       dh_clean
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       $(MAKE) DESTDIR=debian/jigdo-file install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installdocs
+       dh_installexamples
+       dh_installmenu
+       dh_undocumented
+       dh_installchangelogs 
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
index 8269e5c..3c4f6c4 100644 (file)
@@ -51,7 +51,7 @@ userAgent="jigdo-lite/1.1 (`wget --version 2>/dev/null | (read ver; echo $ver)`)
 fetchAndMerge() {
     (mkdir "$tmpDir"; cd "$tmpDir"; fetch "$@")
     # Merge into the image
-    $jigdoFile $jigdoOpts make-image $ijtOpts "$tmpDir"
+    $jigdoFile $jigdoOpts --no-cache make-image $ijtOpts "$tmpDir"
     jigdoErr="$?"
     if test "$jigdoErr" -ge 2; then
         echo "jigdo-file failed with code $jigdoErr - aborting."
@@ -126,7 +126,19 @@ hrule() {
 fetchTemplate() {
     if $fetchedTemplate; then return 0; fi
     echo 'Downloading .template file'
-    fetch --continue "$templateURI"
+    if isURI "$templateURI"; then
+        # Absolute template URL
+        echo 'Downloading .template file'
+        fetch --continue -- "$templateURI"
+    elif isURI "$jigdo"; then
+        # Template URI is relative to absolute jigdo URL
+        echo 'Downloading .template file'
+        fetch --continue -- `echo "$jigdo" | sed 's%[^/]*$%%'`"$templateURI"
+    else
+        # Template URI is relative to local jigdo filename
+        template=`echo "$jigdo" | sed 's%[^/]*$%%'`"$templateURI"
+    fi
+
     fetchedTemplate=true
     # Does template exist now?
     if test ! -r "$template"; then