[Python-apps-commits] r10158 - in packages/catfish/trunk/debian (16 files)

noskcaj-guest at users.alioth.debian.org noskcaj-guest at users.alioth.debian.org
Thu Nov 7 07:58:00 UTC 2013


    Date: Thursday, November 7, 2013 @ 07:57:58
  Author: noskcaj-guest
Revision: 10158

Merge from ubuntu, new maintainer

Added:
  packages/catfish/trunk/debian/catfish.manpages
  packages/catfish/trunk/debian/patches/Manually-Install-Docs.patch
  packages/catfish/trunk/debian/patches/series
Modified:
  packages/catfish/trunk/debian/changelog
  packages/catfish/trunk/debian/compat
  packages/catfish/trunk/debian/control
  packages/catfish/trunk/debian/copyright
  packages/catfish/trunk/debian/rules
  packages/catfish/trunk/debian/source/format
  packages/catfish/trunk/debian/watch
Deleted:
  packages/catfish/trunk/debian/README.source
  packages/catfish/trunk/debian/patches/00list
  packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch
  packages/catfish/trunk/debian/patches/20Fix_desktopfile.dpatch
  packages/catfish/trunk/debian/patches/30Fix_tracker_backend.dpatch
  packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch

Deleted: packages/catfish/trunk/debian/README.source
===================================================================
--- packages/catfish/trunk/debian/README.source	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/README.source	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,38 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
-    debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
---- 
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
-10 Aug 2008.

Added: packages/catfish/trunk/debian/catfish.manpages
===================================================================
--- packages/catfish/trunk/debian/catfish.manpages	                        (rev 0)
+++ packages/catfish/trunk/debian/catfish.manpages	2013-11-07 07:57:58 UTC (rev 10158)
@@ -0,0 +1 @@
+debian/catfish.1
\ No newline at end of file

Modified: packages/catfish/trunk/debian/changelog
===================================================================
--- packages/catfish/trunk/debian/changelog	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/changelog	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,9 +1,62 @@
-catfish (0.3.2-3) UNRELEASED; urgency=low
+catfish (0.8.2-1) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:04:55 +0200
+  [ Jackson Doak ]
+  * Set myself as maintainer
+  * New upstream release
+  * Merge from ubuntu, changes:
+    Closes: #641577, #664326, #579181, #524603, #579564, #589776, #713006
+  * Create debian/catfish.manpages, debian/docs,
+    debian/patches/Manually-Install-Docs.patch
+  * Delete debian/README.source, we no longer use dpatch
+  * debian/copyright: 
+    - Specify GPL-2+
+    - Convert to debian format 1.0
+  * debian/control: 
+    - Bump debhelper to 9
+    - Use "canonical" VCS fields
+    - Update description
+  * debian/compat: Set as 9
+  * Use new URL in debian/watch
+  
+  [ Sean Davis ]
+  * debian/control
+    - Updated standards version to 3.9.4
+    - Updated homepage to launchpad
+    - Remove dependencies on yelp, gksu
+    - Move zeitgeist dependencies to Suggests
+    - Update description to be more accurate    
+  * Update watch file for new home on Launchpad
+    - update debian/watch
 
+  [ Liviu Andronic ]
+  * Misc changes to debian/control.
+  * Simplify debian/rules to ensure it works with newest catfish.
+
+  [ Scott Kitterman ]
+  * Fix Makefile.in.in to install .py instead of .pyc files
+  * Drop obsolete debian/patches/10Fix_makefile.dpatch and 00list
+  * Drop dpatch from build-depends
+  * Add --with python2 so dh_python2 is used
+
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 20Fix_desktopfile.dpatch, 40Fix_gtkiconload.dpatch: dropped, applied
+      upstream.
+    - 30Fix_tracker_backend.dpatch: dropped, tracker support has been removed.
+  * debian/control:
+    - replace gtk2 b-deps with python-gi.
+    - promote python-xdg to depends, the new mimetype filter seems to discard
+      all results without it.
+  * debian/source/format: switch to 3.0 (quilt).
+  * Convert to dh_python2
+    - update debian/rules
+    - update debian/control
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Mon, 14 Oct 2013 17:47:55 +1100
+
 catfish (0.3.2-2) unstable; urgency=low
 
   * Team upload.

Modified: packages/catfish/trunk/debian/compat
===================================================================
--- packages/catfish/trunk/debian/compat	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/compat	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1 +1 @@
-5
+9
\ No newline at end of file

Modified: packages/catfish/trunk/debian/control
===================================================================
--- packages/catfish/trunk/debian/control	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/control	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,27 +1,28 @@
 Source: catfish
 Section: utils
 Priority: optional
-Maintainer: Cody A.W. Somerville <cody-somerville at ubuntu.com>
+Maintainer: Jackson Doak <noskcaj at ubuntu.com>
 Uploaders: Python Applications Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: python-support (>= 0.5.3)
-Standards-Version: 3.9.2
-Homepage: http://software.twotoasts.de/index.php?/pages/catfish_summary.html
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), 
+ python-distutils-extra (>= 2.10)
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.6
+Homepage: https://launchpad.net/catfish-search
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/catfish/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/catfish/trunk/
 
 Package: catfish
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2 (>= 2.6), python-glade2, python-gobject
-Recommends: python-xdg
-Suggests: python-dbus, strigi-daemon, doodle, tracker, beagle
-Description: file search tool that support several different engines
- A file search tool using different backends which is configurable via 
- the command line.
- .
- This program acts as a frontend for different file search engines. 
- The interface is intentionally lightweight and simple. But it takes
- configuration options from the command line.
- .
- Currently find, locate, tracker, strigi, pinot, and beagle are
- supported as backends.
+Depends: ${python:Depends}, 
+ ${misc:Depends}, 
+ gir1.2-glib-2.0,
+ gir1.2-gtk-3.0,
+ gir1.2-pango-1.0,
+ gir1.2-gdkpixbuf-2.0,
+ locate,
+Suggests: python-zeitgeist,
+ zeitgeist
+Description: File searching tool which is configurable via the command line
+ Catfish is a handy file searching tool for Linux and UNIX. 
+ The interface is intentionally lightweight and simple, using only Gtk+3. 
+ You can configure it to your needs by using several command line options.

Modified: packages/catfish/trunk/debian/copyright
===================================================================
--- packages/catfish/trunk/debian/copyright	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/copyright	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,30 +1,32 @@
-This package was debianized by Cody A.W. Somerville <cody-somerville at ubuntu.com> on
-Fri, 12 Jan 2007 22:54:55 -0400.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Catfish-search
+Upstream-Contact: Sean Davis <smd.seandavis at gmail.com>
+Source: https://launchpad.net/catfish-search
 
-It was downloaded from http://software.twotoasts.de/index.php?/pages/catfish_summary.html
+Files:
+Copyright: 2007-2012, Christian Dywan <christian at twotoasts.de>
+ 2012-2013 Sean Davis <smd.seandavis at gmail.com>
+License: GPL-2+
 
-Upstream Author: Christian Dywan <christian at twotoasts.de>
+Files: debian/*
+Copyright: 2007-2009, Cody A.W. Somerville <cody-somerville at ubuntu.com>
+ 2013, Jackson Doak <noskcaj at ubuntu.com>
+License: GPL-2+
 
-Copyright: 2007-2008 (C) Christian Dywan
-
-License:
-
-   This package 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 package 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 St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is © 2007-2009, Cody A.W. Somerville <cody-somerville at ubuntu.com>
-and is licensed under the GPL, see above.
+License: GPL-2+
+ This package 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 package 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 St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
\ No newline at end of file

Deleted: packages/catfish/trunk/debian/patches/00list
===================================================================
--- packages/catfish/trunk/debian/patches/00list	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/patches/00list	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,4 +0,0 @@
-10Fix_makefile.dpatch
-20Fix_desktopfile.dpatch
-30Fix_tracker_backend.dpatch
-40Fix_gtkiconload.dpatch

Deleted: packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-Fix_makefile.dpatch by Cody A.W. Somerville <cody-somerville at ubuntu.com>
-## Updated by Savvas Radevic <vicedar at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix up Makefile.in (ex. Disable python compiling (we'll take care of that).
-##     Also disable the creation of symlinks as we'll handle it in debian/rules
-##     to ensure that it is done correctly.
-
- at DPATCH@
---- catfish-0.3.2/Makefile.in	2009-01-13 17:40:41.000000000 +0100
-+++ catfish-0.3.2/Makefile.in	2009-01-13 17:54:29.000000000 +0100
-@@ -5,7 +5,6 @@
- DESTDIR=
- 
- all: $(LANGUAGE_FILES)
--	$(PYTHON) ./build.py build $(APPNAME)
- 	sed -e s,%prefix%,$(PREFIX), $(APPNAME).in > $(APPNAME)
- 	chmod +x $(APPNAME)
- 
-@@ -18,25 +17,18 @@
- 	install $(APPNAME) $(DESTDIR)/$(PREFIX)/bin
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
--	install $(APPNAME).pyc $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
--	install $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
-+	install $(APPNAME).py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
-+	install --mode=664 $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
--	install $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
--	ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
--
--	install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install COPYING $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install INSTALL $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
--	install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
-+	install --mode=664 $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
-+#	ln -sf $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
- 
- 	install -d $(DESTDIR)/$(PREFIX)/share/applications
- 	install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications
- 
- 	cp -rf locale $(DESTDIR)/$(PREFIX)/share
--	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
-+#	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
- 
- uninstall:
- 	rm -f $(DESTDIR)/$(PREFIX)/share/applications/$(APPNAME).desktop
-@@ -48,7 +40,6 @@
- 
- clean:
- 	rm -Rf locale
--	rm -f *.pyc
- 	rm -f $(APPNAME)
- 	rm -f Makefile
- 	rm -Rf deb

Deleted: packages/catfish/trunk/debian/patches/20Fix_desktopfile.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/20Fix_desktopfile.dpatch	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/patches/20Fix_desktopfile.dpatch	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20Fix_desktopfile.dpatch by  <cody-somerville at ubuntu.com>
-##
-## DP: Removed encoding field from desktop file
-
- at DPATCH@
-diff -urNad catfish-0.3~/catfish.desktop catfish-0.3/catfish.desktop
---- catfish-0.3~/catfish.desktop	2007-07-27 18:12:52.000000000 -0700
-+++ catfish-0.3/catfish.desktop	2008-02-18 16:50:06.000000000 -0800
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Type=Application
- Name=Catfish
- Comment=File search

Deleted: packages/catfish/trunk/debian/patches/30Fix_tracker_backend.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/30Fix_tracker_backend.dpatch	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/patches/30Fix_tracker_backend.dpatch	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30Fix_tracker_backend.dpatch by Michael Biebl <biebl at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compatibility with Tracker 0.8.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' catfish-0.3.2~/catfish.py catfish-0.3.2/catfish.py
---- catfish-0.3.2~/catfish.py	2010-04-13 02:01:04.000000000 +0200
-+++ catfish-0.3.2/catfish.py	2010-04-13 02:01:17.249556252 +0200
-@@ -629,6 +629,7 @@
-                     if self.options.debug: print 'Debug:', msg
-                     query = generic_query()
-                 for filename in query.run(keywords, folder, exact, hidden, limit):
-+                    filename = filename.strip()
-                     if self.abort_find or len(listmodel) == limit: break
-                     filename = filename.split(os.linesep)[0]
-                     # Convert uris to filenames

Deleted: packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/patches/40Fix_gtkiconload.dpatch	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40Fix_gtkiconload.dpatch by Jakub Wilk <jwilk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Prevent program crashing when an icon is missing from the icon theme.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' catfish-0.3.2~/catfish.py catfish-0.3.2/catfish.py
---- catfish-0.3.2~/catfish.py	2012-02-09 02:50:32.000000000 +0100
-+++ catfish-0.3.2/catfish.py	2012-02-09 02:51:33.823351096 +0100
-@@ -707,9 +707,12 @@
-             return self.icon_cache[name]
-         except KeyError:
-             icon_size = gtk.icon_size_lookup(icon_size)[0]
--            icon = self.icon_theme.load_icon(name, icon_size, 0)
--            self.icon_cache[name] = icon
--            return icon
-+            try:
-+                icon = self.icon_theme.load_icon(name, icon_size, 0)
-+                self.icon_cache[name] = icon
-+                return icon
-+            except gobject.GError:
-+                return
- 
-     def get_thumbnail(self, path, icon_size=0, mime_type=None):
-         """Try to fetch a small thumbnail."""

Added: packages/catfish/trunk/debian/patches/Manually-Install-Docs.patch
===================================================================
--- packages/catfish/trunk/debian/patches/Manually-Install-Docs.patch	                        (rev 0)
+++ packages/catfish/trunk/debian/patches/Manually-Install-Docs.patch	2013-11-07 07:57:58 UTC (rev 10158)
@@ -0,0 +1,28 @@
+Description: Manually install documentation
+ Prevent the makefle installing documentation
+ so we can do it properly through debhelper
+Author: Jackson Doak <noskcaj at ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2013-09-21
+
+--- a/Makefile.in.in
++++ b/Makefile.in.in
+@@ -61,12 +61,12 @@
+ 	install data/media/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
+ 	ln -sf $(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
+ 
+-	install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+-	install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+-	install COPYING $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+-	install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+-	install INSTALL $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+-	install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++#	install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++#	install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++#	install COPYING $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++#	install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++#	install INSTALL $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
++#	install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME)
+ 
+ 	install -d $(DESTDIR)/$(PREFIX)/share/applications
+ 	install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications

Added: packages/catfish/trunk/debian/patches/series
===================================================================
--- packages/catfish/trunk/debian/patches/series	                        (rev 0)
+++ packages/catfish/trunk/debian/patches/series	2013-11-07 07:57:58 UTC (rev 10158)
@@ -0,0 +1 @@
+Manually-Install-Docs.patch

Modified: packages/catfish/trunk/debian/rules
===================================================================
--- packages/catfish/trunk/debian/rules	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/rules	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,54 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
 
-config.status: configure
-	dh_testdir
+%:
+	dh $@ --with python2
+
+override_dh_auto_configure:
 	./configure --prefix=/usr
 
-build-indep: patch build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-build-arch: ;
-
-build: build-arch build-indep
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/catfish install
-	dh_link /usr/share/locale /usr/share/catfish/locale
-	dh_link /usr/share/icons/hicolor/scalable/apps/catfish.svg /usr/share/catfish/catfish.svg
-
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs README
-	dh_installmenu
-	dh_pysupport
-	dh_installman debian/catfish.1
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: ;
-
-binary: binary-indep binary-arch
-.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install
+override_dh_installchanglogs:
+	dh_installchangeslogs ChangeLog
\ No newline at end of file

Modified: packages/catfish/trunk/debian/source/format
===================================================================
--- packages/catfish/trunk/debian/source/format	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/source/format	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

Modified: packages/catfish/trunk/debian/watch
===================================================================
--- packages/catfish/trunk/debian/watch	2013-11-06 08:22:13 UTC (rev 10157)
+++ packages/catfish/trunk/debian/watch	2013-11-07 07:57:58 UTC (rev 10158)
@@ -1,2 +1,3 @@
 version=3
-http://software.twotoasts.de/index.php?/pages/catfish_summary.html .*/catfish-(.*)\.tar\.gz
+https://launchpad.net/catfish-search \
+(?:.*/|)catfish(?:-|_|_v|\.|V|)(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz|zip)
\ No newline at end of file




More information about the Python-apps-commits mailing list