[Pkg-xmpp-commits] [jabber-muc] 01/01: Cleanup debian directory.

Willem van den Akker wvdakker-guest at moszumanska.debian.org
Sat Dec 2 21:21:48 UTC 2017 

This is an automated email from the git hooks/post-receive script.

wvdakker-guest pushed a commit to branch master
in repository jabber-muc.

commit 342680b13d111eb51df21ea2aeea94b091c78478
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Sat Dec 2 22:21:15 2017 +0100

    Cleanup debian directory.
    
    Signed-off-by: W. van den Akker <wvdakker at wilsoft.nl>
---
 debian/changelog         | 38 ++++++++++++++++++++---------
 debian/compat            |  2 +-
 debian/control           |  5 ++--
 debian/copyright         | 63 +++++++++++++++++++++---------------------------
 debian/lintian-overrides |  2 --
 debian/rules             |  2 +-
 debian/watch             |  3 ---
 7 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c53cf8f..daaada8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
-jabber-muc (0.8-5) UNRELEASED; urgency=low
-
-  * debian/control: Remove suggested jabberd14.
-
- -- Willem van den Akker <wvdakker at wilsoft.nl>  Sun, 28 Jul 2013 00:36:57 +0200
+jabber-muc (0.8-5) unstable; urgency=low
+
+  * debian/control:
+    - Remove suggested jabberd14.
+    - bump standards version to 4.1.1.
+    - remove Homepage (not active anymore).
+  * debian/compat
+    - bump to 10.
+  * debian/copyright
+    - change License name to shortname.
+    - removed source (not active anymore).
+  * debian/watch
+    - removed.
+  * debian/README.source
+    - added.
+  * debian/lintian.overrides
+    - removed.
+
+ -- Willem van den Akker <wvdakker at wilsoft.nl>  Wed, 29 Nov 2017 12:59:57 +0200
 
 jabber-muc (0.8-4) unstable; urgency=low
 
@@ -10,7 +24,7 @@ jabber-muc (0.8-4) unstable; urgency=low
   * Removed /var/run (Closes: #689894).
     - debian/dirs: removed /var/run entry.
     - debian/postinst: removed /var/run entries.
-    - debian/lintian-overrides: removed /var/run entry. 
+    - debian/lintian-overrides: removed /var/run entry.
     - debian/rules: removed lintian-overrides copy operation.
   * Make debian/component.d/* less bashish.
   * Make it a debhelper package:
@@ -87,7 +101,7 @@ jabber-muc (0.6.0-2) unstable; urgency=low
 
 jabber-muc (0.6.0-1) unstable; urgency=low
 
-  * new upstream version (Closes: #228148) 
+  * new upstream version (Closes: #228148)
 
  -- Jamin W. Collins <jcollins at asgardsrealm.net>  Fri, 16 Jan 2004 15:27:01 -0700
 
@@ -113,13 +127,13 @@ jabber-muc (0.5.2-5) unstable; urgency=low
 
   * updated jabber.d script to start process as daemon
   * updated jabber.d script to call stop/start for restart
-    
+
  -- Jamin W. Collins <jcollins at asgardsrealm.net>  Thu,  7 Aug 2003 14:29:02 -0600
 
 jabber-muc (0.5.2-4) unstable; urgency=low
 
   * updated postrm to check for and remove potentially emptry directories
-  * updated jabber.d script to 
+  * updated jabber.d script to
       - handle stale pid files
       - handle stop request when not started
       - ensure running process stops
@@ -128,19 +142,19 @@ jabber-muc (0.5.2-4) unstable; urgency=low
 
 jabber-muc (0.5.2-3) unstable; urgency=low
 
-  * updated default configuration to run as external process 
+  * updated default configuration to run as external process
 
  -- Jamin W. Collins <jcollins at asgardsrealm.net>  Fri,  4 Jul 2003 12:23:46 -0600
 
 jabber-muc (0.5.2-2) unstable; urgency=low
 
-  * conference module packaged (Closes: #156507) 
+  * conference module packaged (Closes: #156507)
 
  -- Jamin W. Collins <jcollins at asgardsrealm.net>  Sat, 31 May 2003 12:47:53 -0600
 
 jabber-muc (0.5.2-1) unstable; urgency=low
 
-  * new upstream version 
+  * new upstream version
 
  -- Jamin W. Collins <jcollins at asgardsrealm.net>  Fri, 30 May 2003 16:29:48 -0600
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index d1e6cac..36a0c84 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ Section: net
 Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Willem van den Akker <wvdakker at wilsoft.nl>
-Build-Depends: debhelper (>= 9.0.0), libglib2.0-dev, libexpat1-dev, libidn11-dev
-Homepage: https://gna.org/projects/mu-conference/
+Build-Depends: debhelper (>= 10), libglib2.0-dev, libexpat1-dev, libidn11-dev
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xmpp/jabber-muc.git
 Vcs-Git: git://anonscm.debian.org/pkg-xmpp/jabber-muc.git
-Standards-Version: 3.9.4
+Standards-Version: 4.1.1
 
 Package: jabber-muc
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 49a4071..6f4c2cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jabber-muc
-Source: https://gna.org/projects/mu-conference/
 
 Files: *
 Copyright: Copyright © 1999-2002 Jabber.com, Inc.
@@ -8,10 +7,26 @@ Copyright: Copyright © 1999-2002 Jabber.com, Inc.
     	   Copyright © 2003 Paul Curtis <pfc at terrapin.com>
     	   Copyright © 2002-2005 David Sutton jid: peregrine at legend.net.uk
     	   Copyright © 2007 Grégoire Menuel jid: mega at im.apinc.org
-License: GNU General Public License version 2 dated June, 1991.
+License: GPL-2+
+
+Files: src/jabberd/sha.c
+Copyright: 1995-1999 Cryptography Research, Inc.
+License: MPL
+
+Files: src/jabberd/snprintf.c
+Copyright: 1995-1998 The Apache Group
+License: Apache
+
+Files: debian/*
+Copyright: 2002-2007 Jamin W. Collins <jcollins at asgardsrealm.net>
+	   2009-2013 Jorge Salamero Sanz <bencer at debian.org>
+	   2013 Willem van den Akker <wvdakker at wilsoft.nl>
+License: GPL-2+
+
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the license, or
+ the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
@@ -20,13 +35,12 @@ License: GNU General Public License version 2 dated June, 1991.
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-Files: src/jabberd/sha.c
-Copyright: 1995-1999 Cryptography Research, Inc.
-License: Mozilla Public License Version 1.1
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ 
+License: MPL
  The contents of this file are subject to the Mozilla Public
  License Version 1.1 (the "License"); you may not use this file
  except in compliance with the License. You may obtain a copy of
@@ -36,10 +50,8 @@ License: Mozilla Public License Version 1.1
  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
  implied. See the License for the specific language governing
  rights and limitations under the License.
-
-Files: src/jabberd/snprintf.c
-Copyright: 1995-1998 The Apache Group
-License: Apache License Version 1.0
+ 
+License: Apache
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -90,25 +102,4 @@ License: Apache License Version 1.0
  This code is based on, and used with the permission of, the
  SIO stdio-replacement strx_* functions by Panos Tsirigotis
  <panos at alumni.cs.colorado.edu> for xinetd.
-
-Files: debian/*
-Copyright: 2002-2007 Jamin W. Collins <jcollins at asgardsrealm.net>
-	   2009-2013 Jorge Salamero Sanz <bencer at debian.org>
-	   2013 Willem van den Akker <wvdakker at wilsoft.nl>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
+ 
\ No newline at end of file
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 3a03c6b..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-#this error is by design to fix previous error in XML file.
-jabber-muc binary: spelling-error-in-binary
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 840e234..4adeb3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Use debhelper's dh
 %:
-	dh $@ 
+	dh $@
 
 
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 36744f4..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://download.gna.org/mu-conference/mu-conference_(.*).tar.gz
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabber-muc.git

More information about the Pkg-xmpp-commits mailing list