[SCM] libmapper/master: changelog fixes

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3618d19329c4c6419325000e3a7d0e2d4e272d31
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue Jun 17 20:20:18 2014 -0400

    changelog fixes

diff --git a/debian/changelog b/debian/changelog
index a1be3f0..b095987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-libphash (0.3~git+20140610-1) unstable; urgency=low
+libmapper (0.3~git+20140610-1) unstable; urgency=low
 
   * Initial Release. (Closes: #737238)
 
- -- Tiago Bortoletto Vaz <tiago at debian.org>  Mon, 14 Dec 2009 00:05:34 -0200
+ -- Tiago Bortoletto Vaz <tiago at debian/org>  Tue, 17 Jun 2014 19:29:22 -0400
diff --git a/debian/copyright b/debian/copyright
index e7679bd..976ee76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,43 @@
-Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: pHash
-Upstream-Contact: Evan Klinger <eklinger at phash.org>,
-                  David Starkweather <dstarkweather at phash.org>
-Source: http://phash.org/download/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libmapper
+Upstream-Contact: Joseph Malloch <joseph.malloch at mail.mcgill.ca>
+Source: http://libmapper.org
 
 Files: *
-Copyright: 2009, Aetilius, Inc
-License: GPL-3
- This program is free software; you can redistribute it and/or modify
+Copyright: 2014 Joseph Malloch, Stephen Sinclair
+License: GPL-2+
+ This program 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; version 3 dated June, 2007.
- On Debian GNU/Linux systems, the complete text of version 3 of the GNU
- General Public License can be found in `/usr/share/common-licenses/GPL-3'
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: 2009, Tiago Bortoletto Vaz <tiago at debian.org>
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+Copyright: 2014 Tiago Bortoletto Vaz <tiago at debian.org>
+License: GPL-3+
+ This program 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libmapper0-dev.install b/debian/libmapper0-dev.install
deleted file mode 100644
index c797607..0000000
--- a/debian/libmapper0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/*.so
-usr/lib/*/*.a
-usr/include/*
-usr/lib/*/pkgconfig/*
diff --git a/debian/libmapper0.install b/debian/libmapper0.install
deleted file mode 100644
index 9503874..0000000
--- a/debian/libmapper0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index 9512379..5934b86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
-CXXFLAGS += -D__STDC_CONSTANT_MACROS
+#CXXFLAGS += -D__STDC_CONSTANT_MACROS
 
 %:
-	dh $@
+	dh $@ --with autoreconf
+
+override_dh_autoreconf:
+	dh_autoreconf ./autogen.sh

-- 
libmapper packaging