El Sábado, 4 de agosto de 2012, Julien Cristau escribió:
> On Mon, Jul 30, 2012 at 18:31:39 +0200, Raúl Sánchez Siles wrote:
[...]
>
> Care to send a non-reversed debdiff? That makes it kinda painful to
> read.
Oops! Sorry. Find it attached now.
>
> Cheers,
> Julien
Regards,
--
Raúl Sánchez Siles
----->Proud Debian user<-----
Linux registered user #416098
diff -Nru kvirc-4.1.3+20111124.svn5988/debian/changelog kvirc-4.1.3+20111124.svn5988/debian/changelog
--- kvirc-4.1.3+20111124.svn5988/debian/changelog 2011-11-24 13:26:20.000000000 +0100
+++ kvirc-4.1.3+20111124.svn5988/debian/changelog 2012-07-19 21:56:22.000000000 +0200
@@ -1,3 +1,14 @@
+kvirc (4:4.1.3+20111124.svn5988-2) unstable; urgency=low
+
+ * Updated debhelper build-depends to better cope with multiarch.
+ * Fix "must not be "Multi-Arch: same"" kvirc is Multi-Arch: foreign
+ (Closes: #658058)
+ * Actually provide valid -dbg package. Added 30_upstream_build-g
+ * Fix "Hardening flags missing". Applying suggested changes.
+ (Closes: #669189) Thanks to Simon Ruderich.
+
+ -- Raúl Sánchez Siles <rasasi78@gmail.com> Thu, 19 Jul 2012 21:56:08 +0200
+
kvirc (4:4.1.3+20111124.svn5988-1) unstable; urgency=low
The "Land Equilibrium" release.
diff -Nru kvirc-4.1.3+20111124.svn5988/debian/control kvirc-4.1.3+20111124.svn5988/debian/control
--- kvirc-4.1.3+20111124.svn5988/debian/control 2011-09-29 16:24:58.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/control 2012-07-18 18:09:05.000000000 +0200
@@ -1,5 +1,5 @@
Source: kvirc
-Build-Depends: debhelper (>= 8.9.4),
+Build-Depends: debhelper (>= 9),
cmake (>= 2.8.4+dfsg.1-3),
kdelibs5-dev,
libperl-dev,
@@ -33,7 +33,7 @@
${shlibs:Depends},
${misc:Depends}
Suggests: kvirc-dbg (= ${binary:Version})
-Multi-Arch: same
+Multi-Arch: foreign
Description: KDE-based next generation IRC client with module support
A highly configurable graphical IRC client with an MDI interface,
built-in scripting language, support for IRC DCC, drag & drop file
diff -Nru kvirc-4.1.3+20111124.svn5988/debian/patches/00_hardening_upstream.patch kvirc-4.1.3+20111124.svn5988/debian/patches/00_hardening_upstream.patch
--- kvirc-4.1.3+20111124.svn5988/debian/patches/00_hardening_upstream.patch 1970-01-01 01:00:00.000000000 +0100
+++ kvirc-4.1.3+20111124.svn5988/debian/patches/00_hardening_upstream.patch 2012-07-18 18:09:05.000000000 +0200
@@ -0,0 +1,18 @@
+Description: Use build flags from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon@ruderich.org>
+Last-Update: 2012-04-17
+
+--- kvirc-4.1.3+20111124.svn5988.orig/CMakeLists.txt
++++ kvirc-4.1.3+20111124.svn5988/CMakeLists.txt
+@@ -220,8 +220,8 @@ ELSE()
+ ENDIF()
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ #force gdb options
+- SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+- SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+ INCLUDE(CheckCXXCompilerFlag)
+ CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
+ #gcc doesn't support visibility on PE/win32
diff -Nru kvirc-4.1.3+20111124.svn5988/debian/patches/30_upstream_build-g kvirc-4.1.3+20111124.svn5988/debian/patches/30_upstream_build-g
--- kvirc-4.1.3+20111124.svn5988/debian/patches/30_upstream_build-g 1970-01-01 01:00:00.000000000 +0100
+++ kvirc-4.1.3+20111124.svn5988/debian/patches/30_upstream_build-g 2012-07-18 18:09:05.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Added compiler flag generating debug information.
+ With the current provided cmake flags, no debug information was generated in
+ the compilation. The proper flag is added to either CMAKE_C_FLAGS and
+ CMAKE_CXX_FLAGS.
+ .
+ This patch should be forwarded upstream.
+Author: Raúl Sánchez Siles <rasasi78@gmail.com>
+Last-Update: 2012-03-15
+Origin: vendor, http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=blob_plain;f=debian/patches/30_upstream_build-g;hb=HEAD
+Forwarded: no
+---
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,8 +220,8 @@
+ ENDIF()
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ #force gdb options
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
+ INCLUDE(CheckCXXCompilerFlag)
+ CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
+ #gcc doesn't support visibility on PE/win32
diff -Nru kvirc-4.1.3+20111124.svn5988/debian/patches/series kvirc-4.1.3+20111124.svn5988/debian/patches/series
--- kvirc-4.1.3+20111124.svn5988/debian/patches/series 2011-05-07 16:04:07.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/patches/series 2012-07-18 18:09:05.000000000 +0200
@@ -1,4 +1,6 @@
+00_hardening_upstream.patch
05_xpmicon.patch
10_fix_desktop_entry.patch
21_make_shared-mime-info_B-D_superfluous.patch
22_use_old_.protocol_file_names.patch
+30_upstream_build-g
diff -Nru kvirc-4.1.3+20111124.svn5988/debian/rules kvirc-4.1.3+20111124.svn5988/debian/rules
--- kvirc-4.1.3+20111124.svn5988/debian/rules 2011-09-29 16:26:40.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/rules 2012-07-18 18:09:05.000000000 +0200
@@ -2,6 +2,8 @@
#
DH_ALWAYS_EXCLUDE:=CVS:.svn:.svnignore:.hg:.hgignore
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined -Wl,--as-needed
+
DEBVERSION = $(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION = $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
REV = $(shell echo $(UPVERSION) | sed -e 's/^.*svn//' -e 's/\+rc[0-9]$$//')
@@ -21,9 +23,6 @@
dh_auto_configure --parallel -Skde -- -DWANT_COEXISTENCE=OFF \
-DWANT_ESD=OFF -DWANT_OSS=OFF \
-DWANT_STRIP=OFF \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
- -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-DMANUAL_REVISION=$(REV) \
-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
Attachment:
signature.asc
Description: This is a digitally signed message part.