Commit Debian 3.0 (quilt) metadatadebian/6.20180227-1archive/debian/6.20180227-1

[dgit (4.3~bpo9+1) quilt-fixup]

4 files changed, 29 insertions, 65 deletions

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000000..bf7fe43e12
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,28 @@
+The Debian packaging of git-annex is maintained in git, using the
+merging workflow described in dgit-maint-merge(7).  There isn't a
+patch queue that can be represented as a quilt series.
+
+A detailed breakdown of the changes is available from their canonical
+representation - git commits in the packaging repository.  For
+example, to see the changes made by the Debian maintainer in the first
+upload of upstream version 1.2.3, you could use:
+
+    % git clone https://git.dgit.debian.org/git-annex
+    % cd git-annex
+    % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone git-annex`, rather than plain `git
+clone`.)
+
+A single combined diff, containing all the changes, follows.
+--- git-annex-6.20180227.orig/Test.hs
++++ git-annex-6.20180227/Test.hs
+@@ -6,8 +6,6 @@
+  -}
+ 
+ {-# LANGUAGE CPP #-}
+-{- Avoid optimising this file much, since it's large and does not need it._-}
+-{-# OPTIONS_GHC -O1 -optlo-O2 #-}
+ 
+ module Test where
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000000..7bb825291d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes
diff --git a/debian/patches/series.standalone-build b/debian/patches/series.standalone-build
deleted file mode 100644
index 9dc994164d..0000000000
--- a/debian/patches/series.standalone-build
+++ /dev/null
@@ -1 +0,0 @@
-standalone-build
diff --git a/debian/patches/standalone-build b/debian/patches/standalone-build
deleted file mode 100644
index 7a25313b6f..0000000000
--- a/debian/patches/standalone-build
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Yaroslav Halchenko <debian@onerussian.com>
-Subject: Patch debian/ to provide a standalone build of git-annex
-
-Origin: NeuroDebian
-Last-Update: 2015-04-20
-
---- a/debian/control
-+++ b/debian/control
-@@ -85,6 +85,7 @@ Build-Depends:
- 	rsync,
- 	wget,
- 	curl,
-+	locales,
- 	openssh-client,
- 	git-remote-gcrypt (>= 0.20130908-6),
- 	chrpath,
-@@ -96,15 +97,14 @@ Vcs-Git: git://git.kitenet.net/git-annex
- Homepage: http://git-annex.branchable.com/
- XS-Testsuite: autopkgtest
- 
--Package: git-annex
-+Package: git-annex-standalone
- Architecture: any
- Section: utils
--Depends: ${misc:Depends}, ${shlibs:Depends},
--	git (>= 1:1.8.1),
--	rsync,
--	wget,
--	curl,
--	openssh-client (>= 1:5.6p1)
-+Conflicts: git-annex
-+Provides: git-annex
-+Depends: ${misc:Depends},
-+	git,
-+	openssh-client
- Recommends: 
- 	lsof,
- 	gnupg,
-@@ -122,7 +122,7 @@ Suggests:
- 	libnss-mdns,
- 	uftp,
- Breaks: datalad (< 0.9.1)
--Description: manage files with git, without checking their contents into git
-+Description: manage files with git, without checking their contents into git -- standalone build
-  git-annex allows managing files with git, without checking the file
-  contents into git. While that may seem paradoxical, it is useful when
-  dealing with files larger than git can currently easily handle, whether due
-@@ -140,3 +140,7 @@ Description: manage files with git, with
-  noticing when files are changed, and automatically committing them
-  to git and transferring them to other computers. The git-annex webapp
-  makes it easy to set up and use git-annex this way.
-+ .
-+ This package provides a standalone bundle build of git-annex, which
-+ should be installable on any more or less recent Debian or Ubuntu
-+ release.
---- /dev/null
-+++ b/debian/install
-@@ -0,0 +1 @@
-+tmp/git-annex.linux usr/lib
---- /dev/null
-+++ b/debian/links
-@@ -0,0 +1,2 @@
-+/usr/lib/git-annex.linux/git-annex /usr/bin/git-annex
-+/usr/lib/git-annex.linux/git-annex-shell /usr/bin/git-annex-shell