[Python-apps-commits] r7094 - in packages/kabikaboo/trunk/debian (4 files)

[jbicha-guest at users.alioth.debian.org]

    Date: Friday, May 13, 2011 @ 13:49:15
  Author: jbicha-guest
Revision: 7094

Cleaning up packaging, 1.7.2 ready

Modified:
  packages/kabikaboo/trunk/debian/changelog
  packages/kabikaboo/trunk/debian/control
  packages/kabikaboo/trunk/debian/rules
  packages/kabikaboo/trunk/debian/watch

Modified: packages/kabikaboo/trunk/debian/changelog
===================================================================
--- packages/kabikaboo/trunk/debian/changelog	2011-05-13 13:45:03 UTC (rev 7093)
+++ packages/kabikaboo/trunk/debian/changelog	2011-05-13 13:49:15 UTC (rev 7094)
@@ -1,3 +1,17 @@
+kabikaboo (1.7-2) unstable; urgency=low
+
+  * debian/control
+    - Switch to dh_python2
+    - Update Standards-Version to 3.9.1. No changes needed.
+  * debian/copyright
+    - Cleaned up formatting
+  * debian/rules
+    - Simplified
+  * debian/watch
+    - Point to correct download location
+
+ -- Jeremy Bicha <jeremy at bicha.net>  Fri, 13 May 2011 09:00:59 -0400
+
 kabikaboo (1.7-1) unstable; urgency=low
 
   * Initial release

Modified: packages/kabikaboo/trunk/debian/control
===================================================================
--- packages/kabikaboo/trunk/debian/control	2011-05-13 13:45:03 UTC (rev 7093)
+++ packages/kabikaboo/trunk/debian/control	2011-05-13 13:49:15 UTC (rev 7094)
@@ -4,16 +4,21 @@
 Maintainer: Jeremy Bicha <jeremy at bicha.net>
 Uploaders: Dave Kerr <aidave at shaw.ca>, 
  Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), python-support (>= 0.8.4)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), python (>=2.6.6-3~)
+Standards-Version: 3.9.1
 Homepage: https://launchpad.net/kabikaboo
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/kabikaboo/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/kabikaboo/trunk/
 
 Package: kabikaboo
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>=2.14), python-gtksourceview2 (>=2.2),
- python-gtkspell | python-gnome2-extras (<<2.25), python-gnome2
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python (>=2.6.6-3~),
+         python-gtk2 (>=2.14),
+         python-gtksourceview2 (>=2.2),
+         python-gtkspell | python-gnome2-extras (<<2.25),
+         python-gnome2
 Description: Writing Assistant
  Kabikaboo is a tree-based note pad, designed to help you plan a book or complex
   project. Kabikaboo aims to make the author's life easier by providing a way to

Modified: packages/kabikaboo/trunk/debian/rules
===================================================================
--- packages/kabikaboo/trunk/debian/rules	2011-05-13 13:45:03 UTC (rev 7093)
+++ packages/kabikaboo/trunk/debian/rules	2011-05-13 13:49:15 UTC (rev 7094)
@@ -1,57 +1,14 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+%:
+	dh $@ --with python2
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-package = kabikaboo
-DESTDIR = $(CURDIR)/debian/$(package)/usr/share/$(package)
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-
-binary-indep: install
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/bin
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/applications
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/doc/kabikaboo
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/kabikaboo/src
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/kabikaboo/ui
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/man/man1
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/gnome/help/
-	mkdir -p $(CURDIR)/debian/kabikaboo/usr/share/pixmaps/
-	cp -R help/ $(CURDIR)/debian/kabikaboo/usr/share/gnome/help/kabikaboo/
-	cp -a src/* $(DESTDIR)/src/
-	cp -a ui/* $(DESTDIR)/ui/
-	cp -a kabikaboo $(CURDIR)/debian/kabikaboo/usr/bin/
-	cp -a kabikaboo.desktop $(CURDIR)/debian/kabikaboo/usr/share/applications/
-	cp -a kabikaboo.png $(DESTDIR)/
-	cp -a man/kabikaboo.1 $(CURDIR)/debian/kabikaboo/usr/share/man/man1/
-	cp -a debian/changelog $(CURDIR)/debian/kabikaboo/usr/share/doc/kabikaboo/
-
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installmenu
-	dh_pysupport
-	dh_installman
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_install:
+	dh_install help/* $(DESTDIR)usr/share/gnome/help/kabikaboo
+	dh_install src/ $(DESTDIR)usr/share/kabikaboo
+	dh_install ui/ $(DESTDIR)usr/share/kabikaboo
+	dh_install kabikaboo $(DESTDIR)usr/bin
+	dh_install kabikaboo.desktop $(DESTDIR)usr/share/applications
+	dh_install kabikaboo.png $(DESTDIR)usr/share/kabikaboo/
+	dh_install kabikaboo.png $(DESTDIR)usr/share/pixmaps/
+	dh_install man/kabikaboo.1 $(DESTDIR)usr/share/man/man1
+	dh_install

Modified: packages/kabikaboo/trunk/debian/watch
===================================================================
--- packages/kabikaboo/trunk/debian/watch	2011-05-13 13:45:03 UTC (rev 7093)
+++ packages/kabikaboo/trunk/debian/watch	2011-05-13 13:49:15 UTC (rev 7094)
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/kabikaboo/+download http://launchpad.net/kabikaboo/.*/kabikaboo_(.*)\.tar\.gz
+https://launchpad.net/kabikaboo/+download http://launchpad.net/kabikaboo/.*/kabikaboo-(.*)\.tar\.gz