[Pkg-silc-commits] [SCM] terminal based SILC client branch, master, updated. debian/1.1.7-1

Jérémy Bobbio lunar at debian.org
Fri Jun 26 15:28:10 UTC 2009


The following commit has been merged in the master branch:
commit f1b0366f1bd531b0b28201ff30db7b429b6f6848
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Jun 26 00:24:28 2009 +0200

    Remove silc binary package
    
    The official "silc" client that we were shipping in the binary package is
    actually a fork of irssi.  This fork is now several version behing the official
    irssi, and embedded code copy tends to make the security team nervous.
    
    Having such fork is also more or less incompatible with policy 4.13.

diff --git a/debian/changelog b/debian/changelog
index cc0858b..e063362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,13 +8,16 @@ silc-client (1.1.7-1) UNRELEASED; urgency=low
   * Update watch file.
   * Build-Depends on libsilc-dev instead of libsilc-1.1-2-dev, as provided by
     silc-toolkit 1.1.9-1.
+  * Since Debian Policy 3.8.0, embedded code copy are officially not allowed in
+    Debian anymore.  As it was a minor fork of irssi, the silc package
+    providing the official SILC client has been discontinued.
 
   [ Daniel Kahn Gillmor ]
   * cleaned up debian/control: thanks, Lintian!
 
   [ Micah Anderson ]
   * Changed installation of upstream CHANGES to ChangeLog 
-  * Added debugging symbols packages: silc-dbg, irssi-plugin-silc-dbg
+  * Added debugging symbols package irssi-plugin-silc-dbg
 
  -- Jérémy Bobbio <lunar at debian.org>  Thu, 25 Jun 2009 18:08:15 +0200
 
diff --git a/debian/control b/debian/control
index 938bd3f..271c62d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,33 +9,6 @@ Homepage: http://www.silcnet.org/software/users/client/
 Vcs-Git: git://git.debian.org/pkg-silc/silc-client.git
 Vcs-Browser: http://git.debian.org/?p=pkg-silc/silc-client.git
 
-Package: silc
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: terminal based SILC client
- SILC (Secure Internet Live Conferencing) is a network protocol designed
- to provide end-to-end security for conferencing services. SILC has a
- command set and a user interface similar to IRC, but the network
- protocol is completely different as it supports public key strong
- cryptography and a different network model.
- .
- This package provides a terminal based client, much similar to irssi, a well
- recognized IRC client.
-
-Package: silc-dbg
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, silc (= ${binary:Version})
-Description: debug symbols for the terminal based SILC client
- SILC (Secure Internet Live Conferencing) is a network protocol designed
- to provide end-to-end security for conferencing services. SILC has a
- command set and a user interface similar to IRC, but the network
- protocol is completely different as it supports public key strong
- cryptography and a different network model.
- .
- This package provides the debug symbols for the terminal based
- client, much similar to irssi, a well recognized IRC client.
-
 Package: irssi-plugin-silc
 Architecture: any
 Depends: irssi, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 5e714a3..0e35909 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,29 +14,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	-test -e configure-irssi-plugin-stamp -o -e build-irssi-pluginstamp && \
-		$(MAKE) distclean && \
-		rm -f configure-irssi-plugin-stamp build-irssi-pluginstamp
-	rm -f config.guess config.sub
-	ln -sf /usr/share/misc/config.guess
-	ln -sf /usr/share/misc/config.sub
-	./configure --prefix=/usr \
-		--datadir=\$${prefix}/share \
-		--sysconfdir=/etc/silc \
-		--mandir=\$${prefix}/share/man \
-		--docdir=\$${prefix}/share/doc/silc \
-		--enable-debug \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--enable-ipv6 \
-		--with-perl=no \
-		CFLAGS="$(CFLAGS)" \
-		LDFLAGS="-Wl,-z,defs"
-	touch configure-stamp
-
 configure-irssi-plugin: configure-irssi-plugin-stamp
 configure-irssi-plugin-stamp:
 	dh_testdir
@@ -62,14 +39,6 @@ configure-irssi-plugin-stamp:
 		CFLAGS="$(CFLAGS)"
 	touch configure-irssi-plugin-stamp
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	# This is a crude hack until upstream fixes their autotools or includes this directory in their release
-	mkdir -p $(CURDIR)/lib/silcutil/symbian
-	$(MAKE)
-	touch build-stamp
-
 build-irssi-plugin: build-irssi-plugin-stamp
 build-irssi-plugin-stamp: configure-irssi-plugin-stamp
 	dh_testdir
@@ -80,27 +49,10 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f config.guess config.sub
-	rm -f build-stamp configure-stamp
 	rm -f build-irssi-plugin-stamp configure-irssi-plugin-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -psilc
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install -psilc --autodest --sourcedir=debian/tmp
-	dh_installdocs -psilc
-	dh_installexamples -psilc
-	dh_installman -psilc
-
-install-silc-dbg:
-	dh_testdir
-	dh_testroot
-	dh_installdocs -psilc-dbg
-
 install-irssi-plugin: build-irssi-plugin
 	dh_testdir
 	dh_testroot
@@ -116,17 +68,16 @@ install-irssi-plugin-dbg:
 	dh_installdocs -pirssi-plugin-silc-dbg
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
 	# We have nothing to do.
 
 # Build architecture-dependent files here.
-binary-arch: build install build-irssi-plugin install-irssi-plugin install-silc-dbg install-irssi-plugin-dbg
+binary-arch: build-irssi-plugin install-irssi-plugin install-irssi-plugin-dbg
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_link
-	dh_strip -psilc --dbg-package=silc-dbg 
-	dh_strip -pirssi-plugin-silc --dbg-package=irssi-plugin-silc-dbg
+	dh_strip --dbg-package=irssi-plugin-silc-dbg
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -137,5 +88,5 @@ binary-arch: build install build-irssi-plugin install-irssi-plugin install-silc-
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
+.PHONY: clean binary-indep binary-arch binary install \
 	build-irssi-plugin install-irssi-plugin configure-irssi-plugin
diff --git a/debian/silc.README.Debian b/debian/silc.README.Debian
deleted file mode 100644
index 99d9a30..0000000
--- a/debian/silc.README.Debian
+++ /dev/null
@@ -1,7 +0,0 @@
-silc-client for Debian
-----------------------
-
-At 1st, try to use 
-/server silc.silcnet.org
-
- -- Tamas SZERB <toma at rulez.org>, Tue, 30 Oct 2001 00:03:17 +0100
diff --git a/debian/silc.examples b/debian/silc.examples
deleted file mode 100644
index 5e21e83..0000000
--- a/debian/silc.examples
+++ /dev/null
@@ -1 +0,0 @@
-apps/irssi/silc.conf
diff --git a/debian/silc.install b/debian/silc.install
deleted file mode 100644
index d58e411..0000000
--- a/debian/silc.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/silc/silc.conf
-usr/bin/silc
-usr/share/silc/themes
-usr/share/silc/help
diff --git a/debian/silc.manpages b/debian/silc.manpages
deleted file mode 100644
index cb0ddae..0000000
--- a/debian/silc.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/silc.1

-- 
terminal based SILC client



More information about the Pkg-silc-commits mailing list