[Pkg-electronics-commits] [SCM] Packaging for Pcb branch, master, updated. 7bf90e7070501a5a62de4222fcdb92a632b50fc4

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 7bf90e7070501a5a62de4222fcdb92a632b50fc4
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Tue Nov 17 09:23:43 2009 +0200

    Revert "* debian/control: Remove pcb-common's circular dependency with pcb-gtk | pcb-lesstif (Closes: #478710)"
    
    This reverts commit d8f0a383bb51c062eff66b2071de732bf8ac64e7.

diff --git a/debian/control b/debian/control
index fd6d3dd..1e316be 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-electronics/pcb.git
 
 Package: pcb
 Architecture: all
-Depends: ${misc:Depends}, pcb-common
+Depends: ${misc:Depends}, pcb-gtk | pcb-lesstif, pcb-common
 Description: printed circuit board (pcb) design program - meta-package
  PCB is an interactive printed circuit board editor for the X11 window 
  system. PCB includes a rats nest feature, design rule checking, and can 
diff --git a/debian/patches/series b/debian/patches/series
index 3d0aeea..5c48d0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 outdated_config.diff
 desktop.diff
-tryexec.diff
 manpage.diff
diff --git a/debian/patches/tryexec.diff b/debian/patches/tryexec.diff
deleted file mode 100644
index b54e13f..0000000
--- a/debian/patches/tryexec.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Replace Exec with TryExec in case that neither pcb-gtk nor pcb-lesstif got installed.
-Forwarded: no
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
---- a/data/pcb.desktop.in
-+++ b/data/pcb.desktop.in
-@@ -4,7 +4,7 @@
- _GenericName=PCB Design
- _Comment=Create and edit printed circuit board designs
- Type=Application
--Exec=pcb %f
-+TryExec=pcb %f
- Icon=pcb
- MimeType=application/x-pcb-layout;application/x-pcb-footprint;
- Categories=Education;Science;Engineering;Electronics;

-- 
Packaging for Pcb