[Python-apps-commits] r1341 - in packages/catfish/trunk/debian (3 files)
cody-somerville-guest at users.alioth.debian.org
cody-somerville-guest at users.alioth.debian.org
Thu May 22 01:34:15 UTC 2008
Date: Thursday, May 22, 2008 @ 01:34:12
Author: cody-somerville-guest
Revision: 1341
Correctly install symlinks using dh_link. Closes lp: #225205
Modified:
packages/catfish/trunk/debian/changelog
packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch
packages/catfish/trunk/debian/rules
Modified: packages/catfish/trunk/debian/changelog
===================================================================
--- packages/catfish/trunk/debian/changelog 2008-05-21 20:11:14 UTC (rev 1340)
+++ packages/catfish/trunk/debian/changelog 2008-05-22 01:34:12 UTC (rev 1341)
@@ -1,3 +1,15 @@
+catfish (0.3-2) unstable; urgency=low
+
+ * debian/patches/10Fix_makefile.dpatch: UPDATED
+ - Disable the creation of symlinks in Makefile as we will
+ handle it in debian/rules to ensure they are created correctly.
+ * debian/rules:
+ - Updated to create correct symlinks that were being incorrectly created in
+ the Makefile.
+ * Closes lp: #222050
+
+ -- Cody A.W. Somerville <cody-somerville at ubuntu.com> Thu, 22 May 2008 02:48:46 +0200
+
catfish (0.3-1) unstable; urgency=low
* debian/control:
Modified: packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch
===================================================================
--- packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch 2008-05-21 20:11:14 UTC (rev 1340)
+++ packages/catfish/trunk/debian/patches/10Fix_makefile.dpatch 2008-05-22 01:34:12 UTC (rev 1341)
@@ -2,11 +2,13 @@
## 10Disable_compile.dpatch by Cody A.W. Somerville <cody-somerville at ubuntu.com>
##
## DP: Fix up Makefile.in (ex. Diable 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-03 23:20:26.000000000 -0300
-+++ catfish-0.3/Makefile.in 2007-11-02 18:54:49.000000000 -0300
+--- 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
@@ -5,7 +5,6 @@
DESTDIR=
@@ -35,14 +37,14 @@
- 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
++# ln -sf $(DESTDIR)$(PREFIX)/share/pixmaps/$(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
Modified: packages/catfish/trunk/debian/rules
===================================================================
--- packages/catfish/trunk/debian/rules 2008-05-21 20:11:14 UTC (rev 1340)
+++ packages/catfish/trunk/debian/rules 2008-05-22 01:34:12 UTC (rev 1341)
@@ -26,6 +26,8 @@
dh_clean -k
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
binary-indep: build install
dh_testdir
More information about the Python-apps-commits
mailing list