Christoph Biedl wrote... > Only for the sake of closing the gap to upstream I might also "salvage" > inspircd in a few weeks, the new process as described in > https://wiki.debian.org/PackageSalvaging
Hi Guillaume,
time has passed, and unfortunately it's too late now to salvage
inspircd in time to bring it into buster. So I'd like to to a regular
upload, adding myself as an uploader.
I'd highly appreciate your short ACK on this. debdiff on debian/
attached.
Christoph
diff --git a/debian/changelog b/debian/changelog
index ffe745f..d90b482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+inspircd (2.0.27-1) unstable; urgency=medium
+
+ * Add myself to uploaders
+ * New upstream version 2.0.27
+
+ -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Sat, 23 Feb 2019
13:24:05 +0100
+
inspircd (2.0.24-1.1) unstable; urgency=medium
* Non-maintainer upload
diff --git a/debian/control b/debian/control
index 03fad36..91e0ad0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: inspircd
Section: net
Priority: optional
Maintainer: inspircd packagers <inspi...@packages.debian.org>
-Uploaders: Guillaume Delacour <g...@iroqwa.org>
+Uploaders:
+ Guillaume Delacour <g...@iroqwa.org>,
+ Christoph Biedl <debian.a...@manchmal.in-ulm.de>,
Build-Depends: debhelper (>= 9.0.0), perl, libgnutls28-dev, pkg-config,
libldap2-dev, libpcre3-dev, default-libmysqlclient-dev,
libpq-dev,
libsqlite3-dev, zlib1g-dev, libgeoip-dev,
diff --git a/debian/patches/01_dpkg-buildflags_support.diff
b/debian/patches/01_dpkg-buildflags_support.diff
index 6c9c960..e27a585 100644
--- a/debian/patches/01_dpkg-buildflags_support.diff
+++ b/debian/patches/01_dpkg-buildflags_support.diff
@@ -19,7 +19,7 @@ Index: inspircd-2.0.16/make/template/main.mk
CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
BASE = "$(DESTDIR)@BASE_DIR@"
-@@ -132,7 +133,7 @@ CXXFLAGS += -Iinclude
+@@ -139,7 +140,7 @@ CXXFLAGS += -Iinclude
@ENDIF
@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE
CORELDFLAGS
@@ -32,7 +32,7 @@ Index: inspircd-2.0.16/make/unit-cc.pl
===================================================================
--- inspircd-2.0.16.orig/make/unit-cc.pl
+++ inspircd-2.0.16/make/unit-cc.pl
-@@ -79,6 +79,10 @@ sub do_static_link {
+@@ -95,6 +95,10 @@ sub do_static_link {
}
sub do_core_link {
@@ -43,7 +43,7 @@ Index: inspircd-2.0.16/make/unit-cc.pl
my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
print "$execstr\n" if $verbose;
exec $execstr;
-@@ -98,6 +102,7 @@ sub do_compile {
+@@ -114,6 +118,7 @@
my $binary = $ENV{RUNCC};
if ($do_compile) {
$flags = $ENV{CXXFLAGS};
diff --git a/debian/patches/04_reproducible_builds.diff
b/debian/patches/04_reproducible_builds.diff
index f2d0274..439f99b 100644
--- a/debian/patches/04_reproducible_builds.diff
+++ b/debian/patches/04_reproducible_builds.diff
@@ -10,7 +10,7 @@ Index: inspircd/src/inspircd.cpp
===================================================================
--- inspircd.orig/src/inspircd.cpp
+++ inspircd/src/inspircd.cpp
-@@ -511,7 +511,7 @@ InspIRCd::InspIRCd(int argc, char** argv
+@@ -518,7 +518,7 @@ InspIRCd::InspIRCd(int argc, char** argv
}
}
@@ -23,7 +23,7 @@ Index: inspircd/src/users.cpp
===================================================================
--- inspircd.orig/src/users.cpp
+++ inspircd/src/users.cpp
-@@ -785,7 +785,8 @@ void LocalUser::FullConnect()
+@@ -786,7 +786,8 @@ void LocalUser::FullConnect()
this->WriteServ("NOTICE Auth :Welcome to
\002%s\002!",ServerInstance->Config->Network.c_str());
this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network
%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(),
GetFullRealHost().c_str());
this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running
version
%s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
@@ -50,7 +50,7 @@ Index: inspircd/configure
===================================================================
--- inspircd.orig/configure
+++ inspircd/configure
-@@ -859,7 +859,7 @@ my ($mliflags, $mfrules, $mobjs, $mfcoun
+@@ -833,7 +833,7 @@ my ($mliflags, $mfrules, $mobjs, $mfcoun
sub writefiles {
my($writeheader) = @_;
# First File.. inspircd_config.h
diff --git a/debian/watch b/debian/watch
index 056344e..f3a33b6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
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
+.*/archive/v([0-9.]+)\.tar\.gz
signature.asc
Description: PGP signature
