[Pkg-privacy-commits] [libotr] 148/225: Imported Debian patch 3.2.0-4

Sat Aug 22 12:45:18 UTC 2015

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

infinity0 pushed a commit to branch master
in repository libotr.

commit 2c4474bb46ca64e4596ee345d348951e74feaf4d
Author: Thibaut VARENE <varenet at debian.org>
Date:   Mon Dec 26 18:33:08 2011 +0100

    Imported Debian patch 3.2.0-4
---
 debian/changelog                        | 11 +++++++++++
 debian/control                          |  4 ++--
 debian/{libotr2.copyright => copyright} |  0
 debian/{libotr2.install => install}     |  0
 debian/libotr2-bin.dirs                 |  2 --
 debian/libotr2-dev.copyright            | 30 +-----------------------------
 debian/libotr2-dev.dirs                 |  2 --
 debian/libotr2.dirs                     |  1 -
 debian/rules                            |  5 +++--
 debian/source/format                    |  1 +
 debian/watch                            |  3 ---
 11 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 394ac6b..5402404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libotr (3.2.0-4) unstable; urgency=low
+
+  * lintian cleanup:
+    + remove dh_make template
+    + switch to source format 3.0 quilt
+    + fix missing copyright warning
+    + fix debhelper build-depend versionning
+    + add homepage field
+
+ -- Thibaut VARENE <varenet at debian.org>  Mon, 26 Dec 2011 18:33:08 +0100
+
 libotr (3.2.0-3) unstable; urgency=low
 
   * Ship libotr.pc (Closes: #590035)
diff --git a/debian/control b/debian/control
index 1dd2356..ebc0c06 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: libotr
 Section: libs
 Priority: optional
 Maintainer: Thibaut VARENE <varenet at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), autotools-dev
+Build-Depends: debhelper (>= 7.0.0), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), autotools-dev
 Standards-Version: 3.9.2
+Homepage: http://www.cypherpunks.ca/otr/
 
 Package: libotr2
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libotr2-bin (>= ${binary:Version})
diff --git a/debian/libotr2.copyright b/debian/copyright
similarity index 100%
rename from debian/libotr2.copyright
rename to debian/copyright
diff --git a/debian/libotr2.install b/debian/install
similarity index 100%
rename from debian/libotr2.install
rename to debian/install
diff --git a/debian/libotr2-bin.dirs b/debian/libotr2-bin.dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/libotr2-bin.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/libotr2-dev.copyright b/debian/libotr2-dev.copyright
deleted file mode 100644
index bec63cf..0000000
--- a/debian/libotr2-dev.copyright
+++ /dev/null
@@ -1,29 +0,0 @@
-This package was debianized by OTR Dev Team <otr at cypherpunks.ca> on
-Tue, 18 Jan 2005 16:23:41 -0500.
-
-It was downloaded from http://www.cypherpunks.ca/otr/
-
-Copyright (C) 2004-2005 by Nikita Borisov and Ian Goldberg
-
-Upstream Authors: OTR Dev Team <otr at cypherpunks.ca>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under  the terms of the GNU Lesser General Public Licence
-   as published by the Free Software Foundation; version 2.1 dated
-   February, 1999.
-
-   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 Lesser 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.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
diff --git a/debian/libotr2-dev.copyright b/debian/libotr2-dev.copyright
new file mode 120000
index 0000000..e65ac3a
--- /dev/null
+++ b/debian/libotr2-dev.copyright
@@ -0,0 +1 @@
+copyright
\ No newline at end of file
diff --git a/debian/libotr2-dev.dirs b/debian/libotr2-dev.dirs
index 76d6480..c174187 100644
--- a/debian/libotr2-dev.dirs
+++ b/debian/libotr2-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/share/aclocal
diff --git a/debian/libotr2.dirs b/debian/libotr2.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libotr2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/rules b/debian/rules
index 50b2922..d3ec1a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,8 @@ install: build
 	find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -exec \
 		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
 
+	dh_install --list-missing
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -79,7 +81,6 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 #	dh_installexamples
-	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
@@ -98,7 +99,7 @@ binary-arch: build install
 #	dh_python
 	dh_makeshlibs -V
 	dh_installdeb
-	dh_shlibdeps -L libotr2 -l debian/libotr2/usr/lib
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 5805163..014e769 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
 version=2
 http://www.cypherpunks.ca/otr/	libotr-(.*)\.t(?:ar\.)?gz	debian	uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git

