summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorFelipe Sateler <fsateler@debian.org>2015-09-21 18:41:13 -0300
committerFelipe Sateler <fsateler@debian.org>2015-09-21 19:02:21 -0300
commit0de618012c5f95c46eeb4e06b5a6ba12489d6fcb (patch)
tree251d44200323ee90bae0aab49698ea88ac54aaee /debian
parentef03081b0ba6e02de6fb20d27940f6364be36b6f (diff)
Switch from single-debian-patch to standard quilt patch management.
This reverts commits: 296bea20e63b47de1591e295f4fb4bc7d665a4f3 6b9d36bde72d717ab47d172a4b592751b927f731 3ee49dcf640b5d119cb0202dfd08cadf533ea571
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0001-Document-remove-needed-in-manpage.patch23
-rw-r--r--debian/patches/0002-Fix-typo-in-manpage.patch21
-rw-r--r--debian/patches/series2
-rw-r--r--debian/source/local-options1
-rw-r--r--debian/source/local-patch-header2
5 files changed, 46 insertions, 3 deletions
diff --git a/debian/patches/0001-Document-remove-needed-in-manpage.patch b/debian/patches/0001-Document-remove-needed-in-manpage.patch
new file mode 100644
index 0000000..85f8e8b
--- /dev/null
+++ b/debian/patches/0001-Document-remove-needed-in-manpage.patch
@@ -0,0 +1,23 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Tue, 18 Mar 2014 15:04:17 -0300
+Subject: Document --remove-needed in manpage
+
+---
+ patchelf.1 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/patchelf.1 b/patchelf.1
+index 4865256..f5a2aac 100644
+--- a/patchelf.1
++++ b/patchelf.1
+@@ -47,6 +47,10 @@ Prints the RPATH for an executable or library.
+ Forces the use of the obsolete DT_RPATH in the file instead of
+ DT_RUNPATH. By default DT_RPATH is converted to DT_RUNPATH.
+
++.IP "--remove-needed LIBRARY"
++Removes a declared depency on LIBRARY (DT_NEEDED entry). This
++option can be given multiple times.
++
+ .IP --debug
+ Prints details of the changes made to the input file.
+
diff --git a/debian/patches/0002-Fix-typo-in-manpage.patch b/debian/patches/0002-Fix-typo-in-manpage.patch
new file mode 100644
index 0000000..09425c1
--- /dev/null
+++ b/debian/patches/0002-Fix-typo-in-manpage.patch
@@ -0,0 +1,21 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Fri, 28 Mar 2014 15:26:33 -0300
+Subject: Fix typo in manpage
+
+---
+ patchelf.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/patchelf.1 b/patchelf.1
+index f5a2aac..34f9461 100644
+--- a/patchelf.1
++++ b/patchelf.1
+@@ -26,7 +26,7 @@ The single option given operates on a given FILE, editing in place.
+ Change the dynamic loader ("ELF interpreter") of executable given to
+ INTERPRETER.
+
+-.IP --print-intepreter
++.IP --print-interpreter
+ Prints the ELF interpreter of the executable.
+
+ .IP "--set-rpath RPATH"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ef96ada
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Document-remove-needed-in-manpage.patch
+0002-Fix-typo-in-manpage.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 7423a2d..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-single-debian-patch
diff --git a/debian/source/local-patch-header b/debian/source/local-patch-header
deleted file mode 100644
index d498a0a..0000000
--- a/debian/source/local-patch-header
+++ /dev/null
@@ -1,2 +0,0 @@
-This package is maintained in git. The diff is automatically generated by
-the diff of the debian and the upstream branch