debian: misc cleanup

diff --git a/cde/debian/control b/cde/debian/control
index 7c5b19f5e022c5d3d4493663070e13ad3b0a8d82..54b5afdca4aa9fdad53e4673ce012c53c05bce41 100644 (file)
--- a/cde/debian/control
+++ b/cde/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 10),
                libjpeg62-dev,
                libfreetype6-dev,
                libssl-dev,
-               tcl8.6-dev,
+               tcl-dev,
                ksh,
                m4,
                ncompress,
@@ -28,8 +28,7 @@ Build-Depends: debhelper (>= 10),
                rpcbind,
                bison,
                libbison-dev,
-               xbitmaps,
-               chrpath
+               xbitmaps
 Standards-Version: 4.1.2
 Homepage: https://sourceforge.net/projects/cdesktopenv/
 #Vcs-Git: https://anonscm.debian.org/git/collab-maint/cde-desktop.git
@@ -51,7 +50,7 @@ Depends: libxt6,
          libjpeg62,
          libfreetype6,
          libuil4,
-         tcl8.6,
+         tcl,
          ksh,
          m4,
          ncompress,

diff --git a/cde/debian/copyright b/cde/debian/copyright
index b884b9cc8961bcfe44c0d722e4541fdd8d581465..9065de7441e80e1d1a857ae7168ba229b1dc26f5 100644 (file)
--- a/cde/debian/copyright
+++ b/cde/debian/copyright
@@ -39,28 +39,6 @@ Copyright: 1993 - 1999 Hewlett-Packard Company
            2012 - 2016 William Schaub <wschaub@genesi-tech.com>
 License: LGPL-2+
 
-Files: programs/dtdocbook/sgmls/sgml-mode.el
-Copyright: 1992 James Clark <jjc@jclark.com>
-           1992 Free Software Foundation, Inc.
-License: GPL-1+
- 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 1, 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, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 1 can be found in the
- /usr/share/common-licenses/GPL-1 file.
-
 Files: programs/dtinfo/DtMmdb/btree_berkeley/*.h
        programs/dtinfo/DtMmdb/btree_berkeley/bt_close.c
        programs/dtinfo/DtMmdb/btree_berkeley/bt_conv.c

diff --git a/cde/debian/rules b/cde/debian/rules
index 5146b5152bc3f2e9cec1951121f8fd03d606ce55..bb4b22fd0a30ae3fc401a895cc86c1f4639da8af 100755 (executable)
--- a/cde/debian/rules
+++ b/cde/debian/rules
@@ -15,5 +15,5 @@ override_dh_auto_build:
 
 #make install is broken, so we use the install script instead
 override_dh_auto_install:
-       sudo ./admin/IntegTools/dbTools/installCDE -s . -destdir \
+       sudo ./admin/IntegTools/dbTools/installCDE -s . -destDir \
        ./debian/cde-desktop

diff --git a/cde/debian/watch b/cde/debian/watch
index 8a665b5697c124b6396a196bbb7b9745c455a83e..c3fe7b253d38f725fb13857193cdcc86256d4672 100644 (file)
--- a/cde/debian/watch
+++ b/cde/debian/watch
@@ -4,4 +4,4 @@ version=4
 #opts="pgpsigurlmangle=s%$%.sig%"
 
 # SourceForge hosted projects
-http://sf.net/cdesktopenv/ cde-src-(.*)\.tar\.gz debian uupdate
+http://sf.net/cdesktopenv/ cde-(.*)\.tar\.gz debian uupdate