[qrouter] 01/01: To version 1.2.32

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository qrouter.

commit 8807fe0f684ff06523818da7bcd5ce087bc96464
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Sep 19 14:07:57 2014 +0000

    To version 1.2.32
    
    Fixed patches
    
    Updated VERSION file
---
 VERSION                                         |  2 +-
 debian/changelog                                |  2 +-
 debian/patches/01_add_destdir_in_makefile.patch | 39 -------------------------
 debian/patches/01_chmod_executable.patch        | 17 +++++++++++
 debian/patches/02_hardening_and_symbols.patch   | 23 ---------------
 debian/patches/series                           |  3 +-
 6 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/VERSION b/VERSION
index 0848465..3725851 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.31
+1.2.32
diff --git a/debian/changelog b/debian/changelog
index 5c905d8..e3d9862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qrouter (1.2.31-1) unstable; urgency=low
+qrouter (1.2.32-1) unstable; urgency=low
 
   * Initial release (Closes: #760629)
 
diff --git a/debian/patches/01_add_destdir_in_makefile.patch b/debian/patches/01_add_destdir_in_makefile.patch
deleted file mode 100644
index 7ea870b..0000000
--- a/debian/patches/01_add_destdir_in_makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Adding DESTDIR to the install target
-  in the Makefile.
-Forwarded: will do
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-===================================================================
-Index: qrouter-1.2.31/Makefile.in
-===================================================================
---- qrouter-1.2.31.orig/Makefile.in
-+++ qrouter-1.2.31/Makefile.in
-@@ -84,19 +84,19 @@ qrouterexec$(EXEEXT): $(OBJECTS3)
- 
- install-nointerp:
- 	@echo "Installing qrouter"
--	$(INSTALL) -d ${BININSTALL}
--	$(INSTALL) qrouter ${BININSTALL}
-+	$(INSTALL) -d $(DESTDIR)${BININSTALL}
-+	$(INSTALL) qrouter $(DESTDIR)${BININSTALL}
- 
- install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) qrouterexec$(EXEEXT)
- 	@echo "Installing qrouter"
--	$(INSTALL) -d ${BININSTALL}
--	$(INSTALL) -d ${LIBINSTALL}
--	$(INSTALL) qrouter.sh ${BININSTALL}/qrouter
--	$(INSTALL) qrouter$(SHDLIB_EXT) ${LIBINSTALL}
--	$(INSTALL) qrouterexec$(EXEEXT) ${LIBINSTALL}
--	$(INSTALL) console.tcl ${LIBINSTALL}
--	$(INSTALL) tkcon.tcl ${LIBINSTALL}
--	$(INSTALL) qrouter.tcl ${LIBINSTALL}
-+	$(INSTALL) -d $(DESTDIR)${BININSTALL}
-+	$(INSTALL) -d $(DESTDIR)${LIBINSTALL}
-+	$(INSTALL) qrouter.sh $(DESTDIR)${BININSTALL}/qrouter
-+	$(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
-+	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
-+	$(INSTALL) -m 0644 console.tcl $(DESTDIR)${LIBINSTALL}
-+	$(INSTALL) tkcon.tcl $(DESTDIR)${LIBINSTALL}
-+	$(INSTALL) -m 0644 qrouter.tcl $(DESTDIR)${LIBINSTALL}
- 
- uninstall:
- 	$(RM) ${BININSTALL}/qrouter
diff --git a/debian/patches/01_chmod_executable.patch b/debian/patches/01_chmod_executable.patch
new file mode 100644
index 0000000..6b45a51
--- /dev/null
+++ b/debian/patches/01_chmod_executable.patch
@@ -0,0 +1,17 @@
+Description: This sets the correct permission
+  on console.tcl and qrouter.tcl
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+--- qrouter-1.2.32.orig/Makefile
++++ qrouter-1.2.32/Makefile
+@@ -94,9 +94,9 @@ install-tcl: qrouter.sh qrouter.tcl qrou
+ 	$(INSTALL) qrouter.sh $(DESTDIR)${BININSTALL}/qrouter
+ 	$(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) qrouterexec$(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_hardening_and_symbols.patch b/debian/patches/02_hardening_and_symbols.patch
deleted file mode 100644
index 2b9d89d..0000000
--- a/debian/patches/02_hardening_and_symbols.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Passing down CFLAGS and LDFLAGS
-  so that hardening is activated and such that
-  it's not linking with unused libraries.
-Forwarded: will do
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: qrouter-1.2.29/Makefile.in
-===================================================================
---- qrouter-1.2.29.orig/Makefile.in	2014-09-07 19:38:14.893299598 +0200
-+++ qrouter-1.2.29/Makefile.in	2014-09-07 19:38:22.269299551 +0200
-@@ -3,11 +3,11 @@
- #
- 
- # Main compiler arguments
--CFLAGS = @CFLAGS@
-+CFLAGS += @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
- LIBS = @LIBS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS += @LDFLAGS@
- LDDL_FLAGS = @LDDL_FLAGS@
- LD_RUN_PATH = @LD_RUN_PATH@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
diff --git a/debian/patches/series b/debian/patches/series
index 665e0e5..5393cb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_add_destdir_in_makefile.patch
-02_hardening_and_symbols.patch
+01_chmod_executable.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qrouter.git