[qrouter] 03/03: Prepared package for new upstream version
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sat Oct 11 17:51:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository qrouter.
commit 20413ac1d82600043f06a88ff5ec2f0a3265c3e5
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sat Oct 11 17:39:05 2014 +0000
Prepared package for new upstream version
---
debian/changelog | 4 ++--
debian/patches/03_remove_files.patch | 24 +++++++++++-------------
debian/patches/04_build_with_fpic.patch | 19 -------------------
debian/patches/series | 1 -
4 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5731e49..1b9e2ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,10 @@ qrouter (1.3.3-1) unstable; urgency=medium
* New upstream release
- Fixes FTBFS on certain architectures (Closes: 764740)
- - Fixes "invalid command name qrouter::lowerconle" (Closes: 764743)
+ - Fixes "invalid command name qrouter::lowerconsole" (Closes: 764743)
* New standards version 3.9.6
- -- <ruben.undheim at gmail.com> Sat, 11 Oct 2014 19:22:46 +0200
+ -- Ruben Undheim <ruben.undheim at gmail.com> Sat, 11 Oct 2014 19:22:46 +0200
qrouter (1.3.1-1) unstable; urgency=low
diff --git a/debian/patches/03_remove_files.patch b/debian/patches/03_remove_files.patch
index d77f3cd..1a2d323 100644
--- a/debian/patches/03_remove_files.patch
+++ b/debian/patches/03_remove_files.patch
@@ -4,7 +4,7 @@ Description: Remove config.log and config.status
Author: Ruben Undheim <ruben.undheim at gmail.com>
Index: qrouter/config.log
===================================================================
---- qrouter.orig/config.log
+--- qrouter-1.3.3.orig/config.log
+++ /dev/null
@@ -1,428 +0,0 @@
-This file contains any messages produced by compilers while
@@ -323,7 +323,7 @@ Index: qrouter/config.log
-CP='cp'
-CPP='gcc -E'
-CPPFLAGS=' -m64 -fPIC'
--DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DQROUTER_PATH=\"/usr/local/share/qrouter\" -DHAVE_LIBXT=1 -DTCL_QROUTER=1 -DLINUX=1 -DSYSV=1 -DVERSION=\"1.2\" -DREVISION=\"30\"'
+-DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DQROUTER_PATH=\"/usr/local/share/qrouter\" -DHAVE_LIBXT=1 -DTCL_QROUTER=1 -DLINUX=1 -DSYSV=1 -DVERSION=\"1.3\" -DREVISION=\"0\"'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
@@ -354,7 +354,7 @@ Index: qrouter/config.log
-PATH_SEPARATOR=':'
-QROUTER_LIB_DIR='/usr/local/share/qrouter'
-RANLIB='ranlib'
--REVISION='30'
+-REVISION='0'
-RM='rm'
-SHDLIB_EXT='.so'
-SHELL='/bin/sh'
@@ -364,7 +364,7 @@ Index: qrouter/config.log
-STDLIBS=''
-TCL_LIB_DIR='/usr/lib64'
-TK_LIB_DIR='/usr/lib64'
--VERSION='1.2'
+-VERSION='1.3'
-WISH_EXE='/usr/bin/wish'
-XMKMF=''
-X_CFLAGS=''
@@ -431,13 +431,11 @@ Index: qrouter/config.log
-#define TCL_QROUTER 1
-#define LINUX 1
-#define SYSV 1
--#define VERSION "1.2"
--#define REVISION "30"
+-#define VERSION "1.3"
+-#define REVISION "0"
-
-configure: exit 0
-Index: qrouter/config.status
-===================================================================
---- qrouter.orig/config.status
+--- qrouter-1.3.3.orig/config.status
+++ /dev/null
@@ -1,951 +0,0 @@
-#! /bin/sh
@@ -881,7 +879,7 @@ Index: qrouter/config.status
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
--ac_pwd='/home/tim/gitsrc/qrouter-1.2'
+-ac_pwd='/home/tim/gitsrc/qrouter-1.3'
-srcdir='.'
-INSTALL='/usr/bin/install -c'
-test -n "$AWK" || AWK=awk
@@ -1077,8 +1075,8 @@ Index: qrouter/config.status
-S["LDFLAGS"]=""
-S["CFLAGS"]="-g -O2"
-S["CC"]="gcc"
--S["REVISION"]="30"
--S["VERSION"]="1.2"
+-S["REVISION"]="0"
+-S["VERSION"]="1.3"
-S["target_os"]="linux-gnu"
-S["target_vendor"]="unknown"
-S["target_cpu"]="x86_64"
@@ -1100,7 +1098,7 @@ Index: qrouter/config.status
-S["ECHO_C"]=""
-S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DSTDC_HEADERS=1"\
-" -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DQROUTER_PATH=\\\"/usr/local/share/qrouter\\\" -DHAVE_LIBXT=1 -DTCL_QROUTER=1 -DLI"\
--"NUX=1 -DSYSV=1 -DVERSION=\\\"1.2\\\" -DREVISION=\\\"30\\\""
+-"NUX=1 -DSYSV=1 -DVERSION=\\\"1.3\\\" -DREVISION=\\\"0\\\""
-S["mandir"]="${datarootdir}/man"
-S["localedir"]="${datarootdir}/locale"
-S["libdir"]="${exec_prefix}/lib"
diff --git a/debian/patches/04_build_with_fpic.patch b/debian/patches/04_build_with_fpic.patch
deleted file mode 100644
index 1633da3..0000000
--- a/debian/patches/04_build_with_fpic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: This patched makes sure that every source file is built with
- -fPIC.
-Author: Ruben Undheim <ruben.undheim at gmail.com>
---- qrouter-1.3.1.orig/Makefile
-+++ qrouter-1.3.1/Makefile
-@@ -123,4 +123,4 @@ veryclean:
- $(RM) qrouter.sh
-
- .c.o:
-- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INC_SPECS) -c $< -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(SHLIB_CFLAGS) $(DEFS) $(INC_SPECS) -c $< -o $@
---- qrouter-1.3.1.orig/Makefile.in
-+++ qrouter-1.3.1/Makefile.in
-@@ -123,4 +123,4 @@ veryclean:
- $(RM) qrouter.sh
-
- .c.o:
-- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INC_SPECS) -c $< -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(SHLIB_CFLAGS) $(DEFS) $(INC_SPECS) -c $< -o $@
diff --git a/debian/patches/series b/debian/patches/series
index 278b017..b62fe4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01_chmod_executable.patch
02_use_tkcon_from_debian.patch
03_remove_files.patch
-04_build_with_fpic.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qrouter.git
More information about the debian-science-commits
mailing list