debian/ cleaning

* debian/control: git repo move noted
* debian/rules: clean/tidy
* debian/copyright: use machine parseable format

7 files changed, 64 insertions, 88 deletions

diff --git a/debian/changelog b/debian/changelog
index 30990b2..f8d732d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,7 +79,7 @@ sisu-markup-samples (1.0.3-1) unstable; urgency=high
 sisu-markup-samples (1.0.2-2) unstable; urgency=low
 
   * debian/control added "Conflicts: sisu-examples" to existing
-    "Replaces:" same 
+    "Replaces:" same
 
   * Debian release snapshot, uploaded by Wookey
 
@@ -87,7 +87,7 @@ sisu-markup-samples (1.0.2-2) unstable; urgency=low
 
 sisu-markup-samples (1.0.1-1) unstable; urgency=low
 
-  * minor markup fix 
+  * minor markup fix
 
   * Debian release snapshot, uploaded by Wookey
 
diff --git a/debian/control b/debian/control
index f0b3171..4907643 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,16 @@ Source: sisu-markup-samples
 Section: non-free/text
 Priority: extra
 Maintainer: Ralph Amissah <ralph@amissah.com>
-XS-Dm-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
+Homepage: http://www.jus.uio.no/sisu/
+Vcs-Browser: http://git.sisudoc.org/?p=code/sisu-markup-samples.git
+Vcs-Git: git://git.sisudoc.org/git/code/sisu-markup-samples.git
+XS-Dm-Upload-Allowed: yes
 
 Package: sisu-markup-samples
 Architecture: all
 Depends: sisu (>= 0.51)
-Replaces: sisu-examples
-Conflicts: sisu-examples
-Homepage: http://www.jus.uio.no/sisu
 Description: document markup examples for sisu, publish and search framework
  The document samples provided include:
   * "The Wealth of Networks", Jochai Benkler,
diff --git a/debian/copyright b/debian/copyright
index d307c64..a178ddf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,74 +1,53 @@
-This is sisu-markup-samples which contains document markup examples for sisu a program that is written and maintained by Ralph Amissah <ralph@amissah.com>
-on Mon, 2 May 2005 17:33:58 +0100.
-
-The homepage is:
-  <http://www.jus.uio.no/sisu>
-
-The original source can always be found at:
-	<http://www.jus.uio.no/sisu/SiSU/download>
-  <http://www.jus.uio.no/sisu/sisu_download/download>
-	<http://www.jus.uio.no/sisu-sample-markup/pkg/src>
+Author: Ralph Amissah <ralph@amissah.com>
+Download: http://www.jus.uio.no/sisu/
+
+Files: *
+Copyright: (C) 1997...2009 Ralph Amissah <ralph@amissah.com>
+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 complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: setup.rb
+Copyright: Minero Aoki <http://i.loveruby.net/en/projects/setup/>
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ can be found in /usr/share/common-licenses/LGPL-2 file.
+
+Files: 
+Copyright: 
+License: 
+
+[...]
 
 The documents found in this package are marked up for SiSU which is licensed
 under the GPL2 or later.
 
 The content of the documents follows the rights granted by the author or
 original publisher, which is contained within the rights field in each document
-
-SiSU Copyright (C) 1997, 1998, 1999, 2000, 20001, 2002, 2003, 2004, 2005
-Ralph Amissah
-
-License: GPL 2 or later
-
-  GPL2 summary:
-
-  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 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 package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA 02110-1301, USA
-
-  If you have Internet connection, the latest version of the GPL should be
-  available from these locations:
-    <http://www.fsf.org/licenses/gpl.html>
-    <http://www.gnu.org/copyleft/gpl.html>
-    <http://www.jus.uio.no/sisu/gpl2.fsf>
-
-  On Debian systems, the complete text of the GNU General
-  Public License can be found in `/usr/share/common-licenses/GPL'.
-
-  The Free Software Foundation:
-    <http://www.fsf.org/>
-
-For installation purposes the SiSU tarball includes
-
-setup.rb by Minero Aoki
-
-Hompepage:
-  <http://i.loveruby.net/en/projects/setup/>
-
-License:
-  LGPL
-
-and 
-
-install, an installer generated by
-Rant which is by Stefan Lang
-
-Homepage:
-  <http://rant.rubyforge.org/>
-
-License:
-  LGPL
-
-NB: Rant is not included in the SiSU tarball, and is not itself required for
-    the Rant generated install file to work
diff --git a/debian/install b/debian/install
deleted file mode 100644
index b771e62..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-data/sisu_markup_samples usr/share/doc/sisu
diff --git a/debian/rules b/debian/rules
index cb2396a..a522a5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,31 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-build:
 
 clean:
 	dh_testdir
 	dh_testroot
+
 	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+build:
+
+install:
+
+binary: binary-indep
 
-binary-arch: build install
+binary-arch:
 
-binary-indep: build install
+binary-indep:
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
 	dh_installchangelogs CHANGELOG
 	dh_installman
 	dh_install
-	dh_compress -X.rb -X.sst -X.ssm -X.ssi 
+	dh_compress -X.rb -X.sst -X.ssm -X.ssi
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: clean build install binary-indep binary-arch binary
+.PHONY: clean build install binary binary-arch binary-indep
diff --git a/debian/sisu-markup-samples.install b/debian/sisu-markup-samples.install
new file mode 100644
index 0000000..7bba92a
--- /dev/null
+++ b/debian/sisu-markup-samples.install
@@ -0,0 +1 @@
+data/sisu_markup_samples	/usr/share/doc/sisu
diff --git a/debian/manpages b/debian/sisu-markup-samples.manpages
index c60e65b..c60e65b 100644
--- a/debian/manpages
+++ b/debian/sisu-markup-samples.manpages