summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-07-13 15:50:13 +0200
committerRuben Undheim <ruben.undheim@gmail.com>2018-07-13 15:57:17 +0200
commitf361d9efa95f66e0a84ca90cb74b87cb1e130b8e (patch)
tree291f36f944ad3c080b00971bd9612e38685936e0 /debian
parentc56d43735709cf7002e70d848e2abbec96a9fc18 (diff)
Refreshed patches using gbp pq
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch2
-rw-r--r--debian/patches/01_chmod_executable.patch6
-rw-r--r--debian/patches/02_use_tkcon_from_debian.patch9
4 files changed, 10 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 350f2fc..4de1f93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qrouter (1.3.103-1) unstable; urgency=medium
- Replace dpkg-parsechangelog with /usr/share/dpkg/pkg-info.mk
- Make the date formatting timezone independent using LC_ALL=C and
"date -u"
+ * debian/patches: Refreshed patches
-- Ruben Undheim <ruben.undheim@gmail.com> Thu, 12 Jul 2018 23:23:40 +0200
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
index adbf0ff..9619d6c 100644
--- 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
@@ -7,7 +7,7 @@ Subject: FTCBFS: fails to propagate the cross compiler from configure to make
1 file changed, 1 insertion(+)
diff --git a/Makefile.in b/Makefile.in
-index dbe4a1b..76c9b52 100644
+index a7b68ba..1329c06 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,7 @@
diff --git a/debian/patches/01_chmod_executable.patch b/debian/patches/01_chmod_executable.patch
index 8bace25..c3aac6d 100644
--- a/debian/patches/01_chmod_executable.patch
+++ b/debian/patches/01_chmod_executable.patch
@@ -1,5 +1,5 @@
From: Ruben Undheim <ruben.undheim@gmail.com>
-Date: 2015-02-20
+Date: Fri, 20 Feb 2015 00:00:00 +0100
Subject: This sets the correct permission on console.tcl and qrouter.tcl
===================================================================
@@ -8,10 +8,10 @@ Subject: This sets the correct permission on console.tcl and qrouter.tcl
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index cdb4c80..d1d14b0 100644
+index 95ed4d4..7586e15 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -108,9 +108,9 @@ install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) \
+@@ -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}
diff --git a/debian/patches/02_use_tkcon_from_debian.patch b/debian/patches/02_use_tkcon_from_debian.patch
index 0f0db00..278a7de 100644
--- a/debian/patches/02_use_tkcon_from_debian.patch
+++ b/debian/patches/02_use_tkcon_from_debian.patch
@@ -1,7 +1,8 @@
From: Ruben Undheim <ruben.undheim@gmail.com>
-Date: 2015-02-20
+Date: Fri, 20 Feb 2015 00:00:00 +0100
Subject: Use tkon from debian
-Description: This patch makes sure that the tkcon version from debian is used instead of the version bundled with the source of qrouter.
+
+This patch makes sure that the tkcon version from debian is used instead of the version bundled with the source of qrouter.
===================================================================
---
@@ -10,10 +11,10 @@ Description: This patch makes sure that the tkcon version from debian is used in
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index d1d14b0..dbe4a1b 100644
+index 7586e15..a7b68ba 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -109,7 +109,6 @@ install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) \
+@@ -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}