Hi!
(Debian KDE Extras Team mail address corrected)
El Jueves, 12 de julio de 2012, Cyril Brulebois escribió:
> Hello,
>
> and thanks for checking with us.
>
> Raúl Sánchez Siles <rasasi78@gmail.com> (06/07/2012):
> > Since I don't have upload rights I requested regular uploaders
> > first, then kde- extras team for sponsoring. The situation was such
> > that I failed to manage time left to freeze properly and upload didn't
> > happen. Moreover upstream released the 4.2.0 version, which I'm
> > proposing now and which differs slightly with my sponsoring requests.
> > I'm asking now considering kvirc package 4:4.2.0-1 into wheezy, Taking
> > into account [2], I'd like to support my petition on the following
> >
> > points:
> > · Bugs 658058 and 669189 matches multiarch and hardening flags release
> > goals, respectively.
>
> We could consider that.
>
> > · All packages generated are priority optional or extra, and
> >
> > therefore unlikely to harm any other parts of the system. There is no
> > other debian package, excluding those generated by kvirc source
> > package, that depends on it.
>
> Noted, but that alone won't make us give you carte blanche.
>
> > · New upstream release include a very high density of translation
> > updates. For instance, full debdiff [3] shows 646 files changed, 99946
> > insertions(+), 72202 deletions(-) whereas debdiff [4], excluding po
> > dir shows 305 files changed, 5472 insertions(+), 6656 deletions(-)
>
> Even excluding translation updates (which is at least for now very OK
> according to our freeze policy), that's still huge.
>
> > · New upstream release starts 4.2.x major versions, Historically
> > there have been 1 or 2 upstream minor revisions which we (debian) may
> > profit from, specially as regards with security or serious issues. If
> > 4.2.0 is not deployed in Wheezy our base version will be
> > 4.1.3+20111124.svn5988-1, based on a development snapshot. From the
> > maintainers point of view, basing on a stable release is more than
> > convenient.
>
> I can understand that, but that's unfortunate it got released so late as
> far as the wheezy freeze is concerned.
>
> > · One extra cosmetic-point is that this upload means zero bug
> > package. Something that I guess every package maintainer would like
> > to see for his packaged stuff :)
>
> Sorry, but totally irrelevant. :p
>
>
> To summarize, not sure what to advise for this package. Surely the
> proposed changes are much larger than what I'd like at this point of the
> release cycle.
>
> Mraw,
> KiBi.
Thanks for your answer. My apologise for the delay, vacancy were on its way.
Given your answer and provided there are no other opinions here I decided to
prepare a package[0] backporting just the points considered. This is the
changelog:
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.
[0]
http://mentors.debian.net/debian/pool/main/k/kvirc/kvirc_4.1.3+20111124.svn5988-2.dsc
Please, let me know if this approach is acceptable to you and if I can do
anything else to help about this issue.
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 2012-07-19 21:56:22.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/changelog 2011-11-24 13:26:20.000000000 +0100
@@ -1,14 +1,3 @@
-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 2012-07-18 18:09:05.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/control 2011-09-29 16:24:58.000000000 +0200
@@ -1,5 +1,5 @@
Source: kvirc
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 8.9.4),
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: foreign
+Multi-Arch: same
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 2012-07-18 18:09:05.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/patches/00_hardening_upstream.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-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 2012-07-18 18:09:05.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/patches/30_upstream_build-g 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-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 2012-07-18 18:09:05.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/patches/series 2011-05-07 16:04:07.000000000 +0200
@@ -1,6 +1,4 @@
-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 2012-07-18 18:09:05.000000000 +0200
+++ kvirc-4.1.3+20111124.svn5988/debian/rules 2011-09-29 16:26:40.000000000 +0200
@@ -2,8 +2,6 @@
#
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]$$//')
@@ -23,6 +21,9 @@
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.