[Python-apps-commits] r2211 - in packages/catfish/trunk/debian (4 files)

Tue Jan 13 18:47:47 UTC 2009

Date: Tuesday, January 13, 2009 @ 18:47:46
  Author: piotr
Revision: 2211

* New upstream version (0.3.2) Closes: #511492, LP: #316674
* 10Fix_makefile.dpatch updated to follow upstream changes (thanks to Savvas Radevi?\196?\135)
* Updated the copyright years in debian/copyright
* Updated catfish.svg link in debian/rules

Modified:
  packages/catfish/trunk/debian/changelog
  packages/catfish/trunk/debian/copyright
  packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch
  packages/catfish/trunk/debian/rules

Modified: packages/catfish/trunk/debian/changelog
===================================================================

--- packages/catfish/trunk/debian/changelog	2009-01-11 20:58:04 UTC (rev 2210)
+++ packages/catfish/trunk/debian/changelog	2009-01-13 18:47:46 UTC (rev 2211)
@@ -1,7 +1,8 @@
-catfish (0.3.1-1) UNRELEASED; urgency=low
+catfish (0.3.2-1) unstable; urgency=low
 
   [ Marco Rodrigues ]
-  * New upstream version.
+  * New upstream version (0.3.1)
+    + Closes LP: #316674
   * Bump to Standards-Version 3.8.0.
     + Add README.source.
 
@@ -15,8 +16,17 @@
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Marco Rodrigues <gothicx at sapo.pt>  Sun, 13 Jul 2008 20:11:02 +0200
+  [ Savvas RadeviÄ‡ ]
+  * 10Fix_makefile.dpatch updated to follow upstream changes
 
+  [ Piotr OÅ¼arowski ]
+  * New upstream version (0.3.2)
+    + Closes: #511492
+  * Updated the copyright years in debian/copyright
+  * Updated catfish.svg link in debian/rules
+
+ -- Python Applications Team <python-apps-team at lists.alioth.debian.org>  Tue, 13 Jan 2009 19:04:56 +0100
+
 catfish (0.3-2) unstable; urgency=low
 
   * debian/patches/10Fix_makefile.dpatch: UPDATED

Modified: packages/catfish/trunk/debian/copyright
===================================================================
--- packages/catfish/trunk/debian/copyright	2009-01-11 20:58:04 UTC (rev 2210)
+++ packages/catfish/trunk/debian/copyright	2009-01-13 18:47:46 UTC (rev 2211)
@@ -5,7 +5,7 @@
 
 Upstream Author: Christian Dywan <christian at twotoasts.de>
 
-Copyright: 2006-2007 (C) Christian Dywan
+Copyright: 2007-2008 (C) Christian Dywan
 
 License:
 
@@ -26,5 +26,5 @@
 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 (C) 2007, Cody A.W. Somerville <cody-somerville at ubuntu.com> and
-is licensed under the GPL, see above.
+The Debian packaging is Â© 2007-2009, Cody A.W. Somerville <cody-somerville at ubuntu.com>
+and is licensed under the GPL, see above.

Modified: packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch	2009-01-11 20:58:04 UTC (rev 2210)
+++ packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch	2009-01-13 18:47:46 UTC (rev 2211)
@@ -1,14 +1,15 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 10Disable_compile.dpatch by Cody A.W. Somerville <cody-somerville at ubuntu.com>
+## 10-Fix_makefile.dpatch by Cody A.W. Somerville <cody-somerville at ubuntu.com>
+## Updated by Savvas Radevic <vicedar at gmail.com>
 ##
-## DP: Fix up Makefile.in (ex. Diable python compiling (we'll take care of that).
+## 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.
 
 @DPATCH@
-diff -urNad catfish-0.3~/Makefile.in catfish-0.3/Makefile.in
---- catfish-0.3~/Makefile.in	2007-04-04 04:20:26.000000000 +0200
-+++ catfish-0.3/Makefile.in	2008-05-22 02:45:33.000000000 +0200
+--- 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=
  
@@ -26,29 +27,29 @@
 +	install $(APPNAME).py $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
 +	install --mode=664 $(APPNAME).glade $(DESTDIR)/$(PREFIX)/share/$(APPNAME)
  
- 	install -d $(DESTDIR)/$(PREFIX)/share/pixmaps
--	install $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/pixmaps
--	ln -sf $(DESTDIR)/$(PREFIX)/share/pixmaps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg
+ 	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
--	install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc
--	install COPYING $(DESTDIR)/$(PREFIX)/share/doc
--	install ChangeLog $(DESTDIR)/$(PREFIX)/share/doc
--	install INSTALL $(DESTDIR)/$(PREFIX)/share/doc
--	install README $(DESTDIR)/$(PREFIX)/share/doc
-+	install --mode=664 $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/pixmaps
-+#	ln -sf $(DESTDIR)$(PREFIX)/share/pixmaps/$(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
++#	ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale
  
  uninstall:
  	rm -f $(DESTDIR)/$(PREFIX)/share/applications/$(APPNAME).desktop
-@@ -45,7 +37,6 @@
+@@ -48,7 +40,6 @@
  
  clean:
  	rm -Rf locale

Modified: packages/catfish/trunk/debian/rules
===================================================================
--- packages/catfish/trunk/debian/rules	2009-01-11 20:58:04 UTC (rev 2210)
+++ packages/catfish/trunk/debian/rules	2009-01-13 18:47:46 UTC (rev 2211)
@@ -27,7 +27,7 @@
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/catfish install
 	dh_link /usr/share/locale /usr/share/catfish/locale
-	dh_link /usr/share/pixmaps/catfish.svg /usr/share/catfish/catfish.svg
+	dh_link /usr/share/icons/hicolor/scalable/apps/catfish.svg /usr/share/catfish/catfish.svg
 
 binary-indep: build install
 	dh_testdir


