[med-svn] r14774 - in trunk/packages/rostlab/pp-popularity-contest/trunk/debian: . patches
Laszlo Kajan
lkajan at alioth.debian.org
Mon Sep 30 18:51:50 UTC 2013
Author: lkajan
Date: 2013-09-30 18:51:50 +0000 (Mon, 30 Sep 2013)
New Revision: 14774
Added:
trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/do_not_link_with_usr_lib
trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/series
Removed:
trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/noStaticVersion.patch
Modified:
trunk/packages/rostlab/pp-popularity-contest/trunk/debian/changelog
trunk/packages/rostlab/pp-popularity-contest/trunk/debian/control
trunk/packages/rostlab/pp-popularity-contest/trunk/debian/rules
Log:
1.0.6-1: New upstream release. Fixes "pp-popularity-contest link with -L/usr/lib" (Closes: #722819).
Modified: trunk/packages/rostlab/pp-popularity-contest/trunk/debian/changelog
===================================================================
--- trunk/packages/rostlab/pp-popularity-contest/trunk/debian/changelog 2013-09-30 18:06:22 UTC (rev 14773)
+++ trunk/packages/rostlab/pp-popularity-contest/trunk/debian/changelog 2013-09-30 18:51:50 UTC (rev 14774)
@@ -1,3 +1,10 @@
+pp-popularity-contest (1.0.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes "pp-popularity-contest link with -L/usr/lib" (Closes: #722819).
+
+ -- Laszlo Kajan <lkajan at rostlab.org> Mon, 30 Sep 2013 20:31:20 +0200
+
pp-popularity-contest (1.0.5-1) unstable; urgency=low
* New upstream release
Modified: trunk/packages/rostlab/pp-popularity-contest/trunk/debian/control
===================================================================
--- trunk/packages/rostlab/pp-popularity-contest/trunk/debian/control 2013-09-30 18:06:22 UTC (rev 14773)
+++ trunk/packages/rostlab/pp-popularity-contest/trunk/debian/control 2013-09-30 18:51:50 UTC (rev 14774)
@@ -4,10 +4,9 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Laszlo Kajan <lkajan at rostlab.org>
Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libboost-program-options-dev, automake
-Standards-Version: 3.9.3
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/rostlab/pp-popularity-contest/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rostlab/pp-popularity-contest/trunk/
-DM-Upload-Allowed: yes
+Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/wsvn/debian-med/trunk/packages/rostlab/pp-popularity-contest/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/rostlab/pp-popularity-contest/trunk/
Homepage: http://predictprotein.org/
Package: pp-popularity-contest
@@ -38,7 +37,6 @@
Package: pp-popularity-contest-dbg
Section: debug
Architecture: any
-Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, pp-popularity-contest (= ${binary:Version})
Description: debug files for pp-popularity-contest
This package contains the stripped debugging symbols for
Added: trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/do_not_link_with_usr_lib
===================================================================
--- trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/do_not_link_with_usr_lib (rev 0)
+++ trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/do_not_link_with_usr_lib 2013-09-30 18:51:50 UTC (rev 14774)
@@ -0,0 +1,15 @@
+Author: Laszlo Kajan <lkajan at debian.org>
+Description: fixing #722819: "pp-popularity-contest link with -L/usr/lib".
+ In the original upstream, the boost m4 macro adds /usr/lib to BOOST_LDFLAGS.
+Bug-Debian: http://bugs.debian.org/722819
+Forwarded: no
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,6 +15,6 @@
+ pp_popcon_cnt_SOURCES = pp_popcon_cnt.cpp
+
+ AM_CPPFLAGS = $(BOOST_CPPFLAGS) -D__sysconfdir__=\"$(sysconfdir)\" -D__pkgdatadir__=\"$(pkgdatadir)\" -Wall
+-AM_LDFLAGS = $(BOOST_LDFLAGS) -Wall
++AM_LDFLAGS = -Wall
+ LDADD = $(BOOST_PROGRAM_OPTIONS_LIB)
+
Deleted: trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/noStaticVersion.patch
===================================================================
--- trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/noStaticVersion.patch 2013-09-30 18:06:22 UTC (rev 14773)
+++ trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/noStaticVersion.patch 2013-09-30 18:51:50 UTC (rev 14774)
@@ -1,20 +0,0 @@
-Index: pp-popularity-contest-1.0.3.obsolete.0.0682021238180859/src/Makefile.am
-===================================================================
---- pp-popularity-contest-1.0.3.obsolete.0.0682021238180859.orig/src/Makefile.am 2011-09-28 15:45:40.000000000 +0200
-+++ pp-popularity-contest-1.0.3.obsolete.0.0682021238180859/src/Makefile.am 2011-09-30 18:46:53.749729956 +0200
-@@ -9,12 +9,12 @@
- clean-local:
- -rm -f $(man_MANS)
-
--bin_PROGRAMS = pp_popcon_cnt pp_popcon_cnt.static
-+bin_PROGRAMS = pp_popcon_cnt
-
- pp_popcon_cnt_SOURCES = pp_popcon_cnt.cpp
--pp_popcon_cnt_static_SOURCES = pp_popcon_cnt.cpp
-+#pp_popcon_cnt_static_SOURCES = pp_popcon_cnt.cpp
-
--pp_popcon_cnt_static_LDFLAGS = -static
-+#pp_popcon_cnt_static_LDFLAGS = -static
-
- AM_CPPFLAGS = $(BOOST_CPPFLAGS) -D__sysconfdir__=\"$(sysconfdir)\" -D__pkgdatadir__=\"$(pkgdatadir)\" -Wall
- AM_LDFLAGS = $(BOOST_LDFLAGS) -Wall
Added: trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/series
===================================================================
--- trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/series (rev 0)
+++ trunk/packages/rostlab/pp-popularity-contest/trunk/debian/patches/series 2013-09-30 18:51:50 UTC (rev 14774)
@@ -0,0 +1 @@
+do_not_link_with_usr_lib
Modified: trunk/packages/rostlab/pp-popularity-contest/trunk/debian/rules
===================================================================
--- trunk/packages/rostlab/pp-popularity-contest/trunk/debian/rules 2013-09-30 18:06:22 UTC (rev 14773)
+++ trunk/packages/rostlab/pp-popularity-contest/trunk/debian/rules 2013-09-30 18:51:50 UTC (rev 14774)
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
-
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
%:
dh --parallel $@
More information about the debian-med-commit
mailing list