[Pkg-irc-commits] r298 - in /packages/inspircd2/trunk/debian: ./ patches/

kcd-guest at users.alioth.debian.org kcd-guest at users.alioth.debian.org
Thu Jan 2 16:18:23 UTC 2014 

Author: kcd-guest
Date: Thu Jan  2 16:18:23 2014
New Revision: 298

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=298
Log:
New upstream release 2.0.14

Removed:
    packages/inspircd2/trunk/debian/patches/01_spelling_error.diff
    packages/inspircd2/trunk/debian/patches/03_CVE-2012-1836.diff
    packages/inspircd2/trunk/debian/patches/04_FTBFS_kfreebsd.diff
    packages/inspircd2/trunk/debian/patches/05_FTBFS_gcc-4.7.diff
    packages/inspircd2/trunk/debian/patches/06_FTBFS-hurd.diff
Modified:
    packages/inspircd2/trunk/debian/changelog
    packages/inspircd2/trunk/debian/compat
    packages/inspircd2/trunk/debian/control
    packages/inspircd2/trunk/debian/docs
    packages/inspircd2/trunk/debian/inspircd.examples
    packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff
    packages/inspircd2/trunk/debian/patches/series
    packages/inspircd2/trunk/debian/rules
    packages/inspircd2/trunk/debian/watch

Modified: packages/inspircd2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/changelog?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog	(original)
+++ packages/inspircd2/trunk/debian/changelog	Thu Jan  2 16:18:23 2014
@@ -1,10 +1,19 @@
-inspircd (2.0.5-2) unstable; urgency=low
-
-  * debian/patches/06_FTBFS-hurd.diff: Fix FTBFS on Hurd (Closes: #669176)
-    thanks Jonathan Wiltshire
-  * Bump to Standards-Version 3.9.3 (no changes needed)
-
- -- Guillaume Delacour <gui at iroqwa.org>  Sat, 12 May 2012 07:52:49 +0200
+inspircd (2.0.14-1) unstable; urgency=low
+
+  * New upstream release (Closes: #724874)
+  * Drop patches accepted upstream:
+    + debian/patches/01_spelling_error.diff
+    + debian/patches/03_CVE-2012-1836.diff (cherry-picked)
+    + debian/patches/04_FTBFS_kfreebsd.diff
+    + debian/patches/05_FTBFS_gcc-4.7.diff
+    + debian/patches/06_FTBFS-hurd.diff
+  * debian/docs: docs/README has moved to README.md
+  * debian/examples: examples are now in docs/conf
+  * Bump debhelper compat to 9
+  * Remove Bradley Smith as uploaders (Closes: #674890)
+  * debian/watch: update based on sepwatch
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Thu, 19 Dec 2013 00:35:13 +0100
 
 inspircd (2.0.5-1) unstable; urgency=low
 

Modified: packages/inspircd2/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/compat?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/compat	(original)
+++ packages/inspircd2/trunk/debian/compat	Thu Jan  2 16:18:23 2014
@@ -1 +1 @@
-8
+9

Modified: packages/inspircd2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/control?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/control	(original)
+++ packages/inspircd2/trunk/debian/control	Thu Jan  2 16:18:23 2014
@@ -9,7 +9,7 @@
   Giacomo Catenazzi <cate at debian.org>,
   Bradley Smith <bradsmith at debian.org>,
   Guillaume Delacour <gui at iroqwa.org>
-Build-Depends: debhelper (>= 8.0.0), perl-modules, libgnutls-dev, pkg-config,
+Build-Depends: debhelper (>= 9.0.0), perl-modules, libgnutls-dev, pkg-config,
                libldap2-dev, libpcre3-dev, libmysqlclient-dev, libpq-dev,
                libsqlite3-dev, zlib1g-dev, libgeoip-dev,
                libtre-dev, hardening-wrapper

Modified: packages/inspircd2/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/docs?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/docs	(original)
+++ packages/inspircd2/trunk/debian/docs	Thu Jan  2 16:18:23 2014
@@ -1 +1 @@
-docs/README
+README.md

Modified: packages/inspircd2/trunk/debian/inspircd.examples
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/inspircd.examples?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/inspircd.examples	(original)
+++ packages/inspircd2/trunk/debian/inspircd.examples	Thu Jan  2 16:18:23 2014
@@ -1,6 +1,6 @@
-docs/*.example
-docs/aliases
-docs/modules
+docs/conf/*.example
+docs/conf/aliases
+docs/conf/modules
 extras/m_sqloper.mysql.sql
 extras/m_sqloper.postgresql.sql  
 extras/m_sqloper.sqlite3.sql

Modified: packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff	(original)
+++ packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff	Thu Jan  2 16:18:23 2014
@@ -1,10 +1,11 @@
 From: Guillaume Delacour <gui at iroqwa.org>
 Subject: Disable rpath build option in modules
-Last-Update: 2011-11-14
+Last-Update: 2013-12-18
+Forwarded: not-needed
 
 --- a/src/modules/extra/m_mysql.cpp
 +++ b/src/modules/extra/m_mysql.cpp
-@@ -28,7 +28,7 @@
+@@ -37,7 +37,7 @@
  
  /* $ModDesc: SQL Service Provider module for all other m_sql* modules */
  /* $CompileFlags: exec("mysql_config --include") */
@@ -15,18 +16,18 @@
   *
 --- a/src/modules/extra/m_regex_pcre.cpp
 +++ b/src/modules/extra/m_regex_pcre.cpp
-@@ -18,7 +18,7 @@
+@@ -25,7 +25,7 @@
  /* $ModDesc: Regex Provider Module for PCRE */
  /* $ModDep: m_regex.h */
  /* $CompileFlags: exec("pcre-config --cflags") */
 -/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
-+/* $LinkerFlags: exec("pcre-config --libs") -lpcre */
++/* $LinkerFlags: exec("pcre-config --libs") */
  
- #ifdef WINDOWS
+ #ifdef _WIN32
  # pragma comment(lib, "libpcre.lib")
 --- a/src/modules/extra/m_regex_tre.cpp
 +++ b/src/modules/extra/m_regex_tre.cpp
-@@ -18,7 +18,7 @@
+@@ -25,7 +25,7 @@
  
  /* $ModDesc: Regex Provider Module for TRE Regular Expressions */
  /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
@@ -37,12 +38,23 @@
  class TRERegexException : public ModuleException
 --- a/src/modules/extra/m_ssl_gnutls.cpp
 +++ b/src/modules/extra/m_ssl_gnutls.cpp
-@@ -20,7 +20,7 @@
+@@ -41,7 +41,7 @@
  
  /* $ModDesc: Provides SSL support for clients */
- /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
--/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
-+/* $LinkerFlags: pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
+ /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") exec("libgcrypt-config --cflags") */
+-/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") exec("libgcrypt-config --libs") */
++/* $LinkerFlags: pkgconflibs("gnutls","/libgnutls.so","-lgnutls") exec("libgcrypt-config --libs") */
+ /* $NoPedantic */
  
- enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
+ #ifndef GNUTLS_VERSION_MAJOR
+--- a/src/modules/extra/m_ssl_openssl.cpp
++++ b/src/modules/extra/m_ssl_openssl.cpp
+@@ -51,7 +51,7 @@
  
+ /* $LinkerFlags: if("USE_FREEBSD_BASE_SSL") -lssl -lcrypto */
+ /* $CompileFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
+-/* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
++/* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
+ 
+ /* $NoPedantic */
+ 

Modified: packages/inspircd2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/series?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/series	(original)
+++ packages/inspircd2/trunk/debian/patches/series	Thu Jan  2 16:18:23 2014
@@ -1,6 +1 @@
-01_spelling_error.diff
 02_disable_rpath_for_extra_modules.diff
-03_CVE-2012-1836.diff
-04_FTBFS_kfreebsd.diff
-05_FTBFS_gcc-4.7.diff
-06_FTBFS-hurd.diff

Modified: packages/inspircd2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/rules?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/rules	(original)
+++ packages/inspircd2/trunk/debian/rules	Thu Jan  2 16:18:23 2014
@@ -32,7 +32,9 @@
 
 # allow parallel build
 override_dh_auto_build:
-	dh_auto_build --parallel
+	# compile binary with debuginfo (make debug) as upstream don't generate
+	# symbols by default. dh_strip generate a -dbg package (see below)
+	dh_auto_build --parallel -- debug
 
 # install
 override_dh_auto_install:

Modified: packages/inspircd2/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/watch?rev=298&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/watch	(original)
+++ packages/inspircd2/trunk/debian/watch	Thu Jan  2 16:18:23 2014
@@ -1,3 +1,4 @@
 version=3
-opts=dversionmangle=s/\+dfsg$// \
-https://github.com/inspircd/inspircd/downloads /downloads/inspircd/inspircd/InspIRCd-(.+)\.tar\.bz2
+opts=uversionmangle=s/^(2\.1(?:fork|b[123]|a[12]))$/0.0.$1/ \
+https://github.com/inspircd/inspircd/releases \
+.*/archive/v(\d\S*)\.tar\.gz

More information about the Pkg-irc-commits mailing list