Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
I prepared a fix for #590652, debdiff attached (minus the changes to
Megahal/Makefile.old that are no longer included). The update also
includes some updates to the packaging.
Is the release team okay with uploading this to unstable?
Regards,
Ansgar
reverted:
--- megahal-9.1.1a/dirs
+++ megahal-9.1.1a.orig/dirs
@@ -1,2 +0,0 @@
-usr/bin
-usr/lib/megahal
diff -u megahal-9.1.1a/debian/changelog megahal-9.1.1a/debian/changelog
--- megahal-9.1.1a/debian/changelog
+++ megahal-9.1.1a/debian/changelog
@@ -1,3 +1,18 @@
+megahal (9.1.1a-9) unstable; urgency=low
+
+ * QA upload.
+ * Replace build-dep on tcp8.3-dev with tcl-dev. (Closes: #590652)
+ + Change Makefile to use /usr/include/tcl.
+ * Use debhelper compat level 7.
+ + debian/rules: Use dh_prep instead of dh_clean -k.
+ * debian/copyright: Refer to /usr/share/common-licenses/GPL-2.
+ * debian/control: Add ${misc:Depends}.
+ * debian/rules: Remove Megahal/Makefile.old in clean target.
+ * Remove ./dirs: should be debian/dirs which already exists.
+ * Bump Standards-Version to 3.9.1.
+
+ -- Ansgar Burchardt <ans...@43-1.org> Thu, 26 Aug 2010 14:15:48 +0900
+
megahal (9.1.1a-8) unstable; urgency=low
* QA upload.
diff -u megahal-9.1.1a/debian/rules megahal-9.1.1a/debian/rules
--- megahal-9.1.1a/debian/rules
+++ megahal-9.1.1a/debian/rules
@@ -48,7 +48,7 @@
binary-arch: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install -s megahal debian/megahal/usr/bin
install debian/megahal-personal debian/megahal/usr/bin
diff -u megahal-9.1.1a/debian/control megahal-9.1.1a/debian/control
--- megahal-9.1.1a/debian/control
+++ megahal-9.1.1a/debian/control
@@ -1,14 +1,14 @@
Source: megahal
Section: misc
Priority: optional
-Build-Depends: debhelper, tcl8.3-dev, python-all-dev (>= 2.3.5-11),
python-support (>= 0.3)
+Build-Depends: debhelper (>= 7), tcl-dev, python-all-dev (>= 2.3.5-11),
python-support (>= 0.3)
Maintainer: Debian QA Group <packa...@qa.debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
Homepage: http://megahal.alioth.debian.org/
Package: megahal
Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Suggests: ${python:Depends}
Description: conversation simulator that can learn as you talk to it
diff -u megahal-9.1.1a/debian/copyright megahal-9.1.1a/debian/copyright
--- megahal-9.1.1a/debian/copyright
+++ megahal-9.1.1a/debian/copyright
@@ -17,2 +17,2 @@
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of version 2 of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
diff -u megahal-9.1.1a/debian/compat megahal-9.1.1a/debian/compat
--- megahal-9.1.1a/debian/compat
+++ megahal-9.1.1a/debian/compat
@@ -1,2 +1 @@
-4
-
+7
only in patch2:
unchanged:
--- megahal-9.1.1a.orig/Makefile
+++ megahal-9.1.1a/Makefile
@@ -18,7 +18,9 @@
# DEBUG=-DDEBUG
TCLVERSION=8.3
-TCLINCLUDE=-I/usr/include/tcl$(TCLVERSION)
+# /usr/include/tcl is provided by tcl-dev on Debian
+#TCLINCLUDE=-I/usr/include/tcl$(TCLVERSION)
+TCLINCLUDE=-I/usr/include/tcl
CFLAGS=-g -Wall
only in patch2:
unchanged:
--- megahal-9.1.1a.orig/debian/clean
+++ megahal-9.1.1a/debian/clean
@@ -0,0 +1 @@
+Megahal/Makefile.old
