[Pkg-electronics-commits] [pcb] 01/01: Add rm_mimelnk.diff patch to remove deprecated mimelnk files
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at users.sourceforge.net
Thu Sep 14 15:16:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
aelmahmoudy-guest pushed a commit to branch master
in repository pcb.
commit 2269e7959718901c1f4e0ebbfd6b442ea32c2fed
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date: Thu Sep 14 12:51:34 2017 +0000
Add rm_mimelnk.diff patch to remove deprecated mimelnk files
Closes: #875526
---
debian/patches/rm_mimelnk.diff | 167 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 168 insertions(+)
diff --git a/debian/patches/rm_mimelnk.diff b/debian/patches/rm_mimelnk.diff
new file mode 100644
index 0000000..c0debd8
--- /dev/null
+++ b/debian/patches/rm_mimelnk.diff
@@ -0,0 +1,167 @@
+Description: remove deprecated mimelnk files
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+Bug-Debian: http://bugs.debian.org/875526
+Bug-Upstream: https://bugs.launchpad.net/pcb/+bug/1717254
+Forwarded: https://launchpadlibrarian.net/336989912/rm_mimelnk.diff
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 70d630b..04a9b0f 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -61,14 +61,6 @@ kdedatadir=@KDEDATADIR@
+ mimelnkdir = $(kdedatadir)/mimelnk
+ applicationdir = $(mimelnkdir)/application
+
+-application_in_files = \
+- x-pcb-layout.desktop.in \
+- x-pcb-footprint.desktop.in \
+- x-pcb-netlist.desktop.in \
+- x-gerber.desktop.in \
+- x-excellon.desktop.in
+-application_DATA = $(application_in_files:.desktop.in=.desktop)
+-
+ install_icon_exec = \
+ $(SETENV) GTK_UPDATE_ICON_CACHE_BIN="@GTK_UPDATE_ICON_CACHE_BIN@" \
+ $(SHELL) $(top_srcdir)/icon-theme-installer \
+@@ -100,7 +92,7 @@ endif
+ $(install_icon_exec) -u $(theme_icons)
+
+ MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in
+-DISTCLEANFILES = $(xml_DATA) $(appdata_DATA) $(application_DATA) $(desktop_DATA)
++DISTCLEANFILES = $(xml_DATA) $(appdata_DATA) $(desktop_DATA)
+ EXTRA_DIST = $(mime_icon_files) $(mime_icon_sources) \
+ $(appdata_in_files) $(appdata_DATA) \
+ $(xml_in_files) $(xml_DATA) \
+diff --git a/data/Makefile.in b/data/Makefile.in
+index a3871b4..8f06f47 100644
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -91,7 +91,7 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(appdatadir)" \
+ "$(DESTDIR)$(applicationdir)" "$(DESTDIR)$(desktopdir)" \
+ "$(DESTDIR)$(xmldir)"
+-DATA = $(appdata_DATA) $(application_DATA) $(desktop_DATA) $(xml_DATA)
++DATA = $(appdata_DATA) $(desktop_DATA) $(xml_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -372,14 +372,6 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
+ kdedatadir = @KDEDATADIR@
+ mimelnkdir = $(kdedatadir)/mimelnk
+ applicationdir = $(mimelnkdir)/application
+-application_in_files = \
+- x-pcb-layout.desktop.in \
+- x-pcb-footprint.desktop.in \
+- x-pcb-netlist.desktop.in \
+- x-gerber.desktop.in \
+- x-excellon.desktop.in
+-
+-application_DATA = $(application_in_files:.desktop.in=.desktop)
+ install_icon_exec = \
+ $(SETENV) GTK_UPDATE_ICON_CACHE_BIN="@GTK_UPDATE_ICON_CACHE_BIN@" \
+ $(SHELL) $(top_srcdir)/icon-theme-installer \
+@@ -391,7 +383,7 @@ install_icon_exec = \
+ -x "$(INSTALL_DATA)"
+
+ MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in
+-DISTCLEANFILES = $(xml_DATA) $(appdata_DATA) $(application_DATA) $(desktop_DATA)
++DISTCLEANFILES = $(xml_DATA) $(appdata_DATA) $(desktop_DATA)
+ EXTRA_DIST = $(mime_icon_files) $(mime_icon_sources) \
+ $(appdata_in_files) $(appdata_DATA) \
+ $(xml_in_files) $(xml_DATA) \
+@@ -453,26 +445,6 @@ uninstall-appdataDATA:
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(appdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(appdatadir)" && rm -f $$files
+-install-applicationDATA: $(application_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(applicationdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationdir)"
+- @list='$(application_DATA)'; test -n "$(applicationdir)" || list=; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(applicationdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(applicationdir)" || exit $$?; \
+- done
+-
+-uninstall-applicationDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(application_DATA)'; test -n "$(applicationdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(applicationdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(applicationdir)" && rm -f $$files
+ install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+diff --git a/data/x-excellon.desktop.in b/data/x-excellon.desktop.in
+deleted file mode 100644
+index 772afbf..0000000
+--- a/data/x-excellon.desktop.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-_Comment=Excellon drill file
+-MimeType=application/x-excellon
+-Type=MimeType
+-Icon=application-x-excellon
+-Patterns=*.cnc
+-X-KDE-IsAlso=text/plain
+diff --git a/data/x-gerber.desktop.in b/data/x-gerber.desktop.in
+deleted file mode 100644
+index 73a7f52..0000000
+--- a/data/x-gerber.desktop.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-_Comment=Gerber file
+-MimeType=application/x-gerber
+-Type=MimeType
+-Icon=application-x-gerber
+-Patterns=*.gbr
+-X-KDE-IsAlso=text/plain
+diff --git a/data/x-pcb-footprint.desktop.in b/data/x-pcb-footprint.desktop.in
+deleted file mode 100644
+index 2a062be..0000000
+--- a/data/x-pcb-footprint.desktop.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-_Comment=PCB footprint
+-MimeType=application/x-pcb-footprint
+-Type=MimeType
+-Icon=application-x-pcb-footprint
+-Patterns=*.fp
+-X-KDE-IsAlso=text/plain
+diff --git a/data/x-pcb-layout.desktop.in b/data/x-pcb-layout.desktop.in
+deleted file mode 100644
+index 3d12f12..0000000
+--- a/data/x-pcb-layout.desktop.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-_Comment=PCB layout
+-MimeType=application/x-pcb-layout
+-Type=MimeType
+-Icon=application-x-pcb-layout
+-Patterns=*.pcb
+-X-KDE-IsAlso=text/plain
+diff --git a/data/x-pcb-netlist.desktop.in b/data/x-pcb-netlist.desktop.in
+deleted file mode 100644
+index f6ce351..0000000
+--- a/data/x-pcb-netlist.desktop.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-_Comment=PCB netlist
+-MimeType=application/x-pcb-netlist
+-Type=MimeType
+-Icon=application-x-pcb-netlist
+-Patterns=*.net
+-X-KDE-IsAlso=text/plain
diff --git a/debian/patches/series b/debian/patches/series
index 0dc3ebd..9f22fec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ dont_fail_on_skipped_tests.diff
fix-obsolete-appdata-metadata.diff
appdata-new-location.diff
appdata-new-location-2.diff
+rm_mimelnk.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/pcb.git
More information about the Pkg-electronics-commits
mailing list