summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-08-02 15:05:26 +0200
committerRuben Undheim <ruben.undheim@gmail.com>2018-08-02 15:05:26 +0200
commitf0f2ace2912a4745c76a15e4e4f174e11dd742a5 (patch)
treeeca4ed60c642517e2c7fbdc00363a3e4eff6811b /debian
parentf361d9efa95f66e0a84ca90cb74b87cb1e130b8e (diff)
git-debrebase convert-from-gbp: drop patches from tree
Delete debian/patches, as part of converting to git-debrebase format. [git-debrebase convert-from-gbp: drop patches from tree]
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch20
-rw-r--r--debian/patches/01_chmod_executable.patch25
-rw-r--r--debian/patches/02_use_tkcon_from_debian.patch37
-rw-r--r--debian/patches/series3
4 files changed, 0 insertions, 85 deletions
diff --git a/debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch b/debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch
deleted file mode 100644
index 9619d6c..0000000
--- a/debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ruben Undheim <ruben.undheim@gmail.com>
-Date: Wed, 11 Jul 2018 13:01:29 +0200
-Subject: FTCBFS: fails to propagate the cross compiler from configure to make
-
----
- Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index a7b68ba..1329c06 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -3,6 +3,7 @@
- #
-
- # Main compiler arguments
-+CC = @CC@
- CFLAGS += @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
diff --git a/debian/patches/01_chmod_executable.patch b/debian/patches/01_chmod_executable.patch
deleted file mode 100644
index c3aac6d..0000000
--- a/debian/patches/01_chmod_executable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ruben Undheim <ruben.undheim@gmail.com>
-Date: Fri, 20 Feb 2015 00:00:00 +0100
-Subject: This sets the correct permission on console.tcl and qrouter.tcl
-
-===================================================================
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 95ed4d4..7586e15 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -110,9 +110,9 @@ install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) \
- $(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
- $(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
- $(INSTALL) qrouternullg$(EXEEXT) $(DESTDIR)${LIBINSTALL}
-- $(INSTALL) console.tcl $(DESTDIR)${LIBINSTALL}
-+ $(INSTALL) -m 0644 console.tcl $(DESTDIR)${LIBINSTALL}
- $(INSTALL) tkcon.tcl $(DESTDIR)${LIBINSTALL}
-- $(INSTALL) qrouter.tcl $(DESTDIR)${LIBINSTALL}
-+ $(INSTALL) -m 0644 qrouter.tcl $(DESTDIR)${LIBINSTALL}
-
- uninstall:
- $(RM) $(DESTDIR)${BININSTALL}/qrouter
diff --git a/debian/patches/02_use_tkcon_from_debian.patch b/debian/patches/02_use_tkcon_from_debian.patch
deleted file mode 100644
index 278a7de..0000000
--- a/debian/patches/02_use_tkcon_from_debian.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Ruben Undheim <ruben.undheim@gmail.com>
-Date: Fri, 20 Feb 2015 00:00:00 +0100
-Subject: Use tkon from debian
-
-This patch makes sure that the tkcon version from debian is used instead of the version bundled with the source of qrouter.
-
-===================================================================
----
- Makefile.in | 1 -
- qrouter.sh.in | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7586e15..a7b68ba 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -111,7 +111,6 @@ install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) \
- $(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
- $(INSTALL) qrouternullg$(EXEEXT) $(DESTDIR)${LIBINSTALL}
- $(INSTALL) -m 0644 console.tcl $(DESTDIR)${LIBINSTALL}
-- $(INSTALL) tkcon.tcl $(DESTDIR)${LIBINSTALL}
- $(INSTALL) -m 0644 qrouter.tcl $(DESTDIR)${LIBINSTALL}
-
- uninstall:
-diff --git a/qrouter.sh.in b/qrouter.sh.in
-index 12bab42..8e7cbda 100755
---- a/qrouter.sh.in
-+++ b/qrouter.sh.in
-@@ -57,7 +57,7 @@ shift
-
- if [ $TKCON ]; then
-
-- exec ${loclibdir}/tkcon.tcl \
-+ exec /usr/bin/tkcon \
- -eval "source ${loclibdir}/console.tcl" \
- -slave "package require Tk; set argc $#; set argv [list $*]; \
- source ${loclibdir}/qrouter.tcl"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1ecbe17..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01_chmod_executable.patch
-02_use_tkcon_from_debian.patch
-0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch