[Pkg-electronics-commits] [pcb] 01/01: rm_mimelnk.diff: patch po/POTFILES.in too

أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmoudy at users.sourceforge.net
Fri Sep 29 06:47:39 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 df1fd4719f06e3ef1071555e2c71e7460248cc2d
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Fri Sep 29 08:26:32 2017 +0200

    rm_mimelnk.diff: patch po/POTFILES.in too
---
 debian/patches/rm_mimelnk.diff | 89 ++++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/debian/patches/rm_mimelnk.diff b/debian/patches/rm_mimelnk.diff
index c0debd8..4502023 100644
--- a/debian/patches/rm_mimelnk.diff
+++ b/debian/patches/rm_mimelnk.diff
@@ -3,11 +3,11 @@ Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourcef
 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@
+Index: pcb/data/Makefile.am
+===================================================================
+--- pcb.orig/data/Makefile.am	2017-09-29 08:19:17.453495128 +0200
++++ pcb/data/Makefile.am	2017-09-29 08:19:17.449495113 +0200
+@@ -61,14 +61,6 @@
  mimelnkdir = $(kdedatadir)/mimelnk
  applicationdir = $(mimelnkdir)/application
  
@@ -22,7 +22,7 @@ index 70d630b..04a9b0f 100644
  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
+@@ -100,7 +92,7 @@
  	$(install_icon_exec) -u $(theme_icons)
  
  MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in
@@ -31,11 +31,11 @@ index 70d630b..04a9b0f 100644
  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 = \
+Index: pcb/data/Makefile.in
+===================================================================
+--- pcb.orig/data/Makefile.in	2017-09-29 08:19:17.453495128 +0200
++++ pcb/data/Makefile.in	2017-09-29 08:19:17.453495128 +0200
+@@ -91,7 +91,7 @@
  am__installdirs = "$(DESTDIR)$(appdatadir)" \
  	"$(DESTDIR)$(applicationdir)" "$(DESTDIR)$(desktopdir)" \
  	"$(DESTDIR)$(xmldir)"
@@ -44,7 +44,7 @@ index a3871b4..8f06f47 100644
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ALLOCA = @ALLOCA@
-@@ -372,14 +372,6 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
+@@ -372,14 +372,6 @@
  kdedatadir = @KDEDATADIR@
  mimelnkdir = $(kdedatadir)/mimelnk
  applicationdir = $(mimelnkdir)/application
@@ -59,7 +59,7 @@ index a3871b4..8f06f47 100644
  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 = \
+@@ -391,7 +383,7 @@
  	-x "$(INSTALL_DATA)"
  
  MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in
@@ -68,7 +68,7 @@ index a3871b4..8f06f47 100644
  EXTRA_DIST = $(mime_icon_files) $(mime_icon_sources) \
               $(appdata_in_files) $(appdata_DATA) \
               $(xml_in_files) $(xml_DATA) \
-@@ -453,26 +445,6 @@ uninstall-appdataDATA:
+@@ -453,26 +445,6 @@
  	test -n "$$files" || exit 0; \
  	echo " ( cd '$(DESTDIR)$(appdatadir)' && rm -f" $$files ")"; \
  	cd "$(DESTDIR)$(appdatadir)" && rm -f $$files
@@ -95,11 +95,10 @@ index a3871b4..8f06f47 100644
  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
+Index: pcb/data/x-excellon.desktop.in
+===================================================================
+--- pcb.orig/data/x-excellon.desktop.in	2017-09-29 08:19:17.453495128 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,8 +0,0 @@
 -[Desktop Entry]
 -Encoding=UTF-8
@@ -109,11 +108,10 @@ index 772afbf..0000000
 -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
+Index: pcb/data/x-gerber.desktop.in
+===================================================================
+--- pcb.orig/data/x-gerber.desktop.in	2017-09-29 08:19:17.453495128 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,8 +0,0 @@
 -[Desktop Entry]
 -Encoding=UTF-8
@@ -123,11 +121,10 @@ index 73a7f52..0000000
 -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
+Index: pcb/data/x-pcb-footprint.desktop.in
+===================================================================
+--- pcb.orig/data/x-pcb-footprint.desktop.in	2017-09-29 08:19:17.453495128 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,8 +0,0 @@
 -[Desktop Entry]
 -Encoding=UTF-8
@@ -137,11 +134,10 @@ index 2a062be..0000000
 -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
+Index: pcb/data/x-pcb-layout.desktop.in
+===================================================================
+--- pcb.orig/data/x-pcb-layout.desktop.in	2017-09-29 08:19:17.453495128 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,8 +0,0 @@
 -[Desktop Entry]
 -Encoding=UTF-8
@@ -151,11 +147,10 @@ index 3d12f12..0000000
 -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
+Index: pcb/data/x-pcb-netlist.desktop.in
+===================================================================
+--- pcb.orig/data/x-pcb-netlist.desktop.in	2017-09-29 08:19:17.453495128 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,8 +0,0 @@
 -[Desktop Entry]
 -Encoding=UTF-8
@@ -165,3 +160,19 @@ index f6ce351..0000000
 -Icon=application-x-pcb-netlist
 -Patterns=*.net
 -X-KDE-IsAlso=text/plain
+Index: pcb/po/POTFILES.in
+===================================================================
+--- pcb.orig/po/POTFILES.in	2017-09-29 07:48:56.738205393 +0200
++++ pcb/po/POTFILES.in	2017-09-29 08:24:15.818689716 +0200
+@@ -1,11 +1,6 @@
+ data/pcb.appdata.xml.in
+ data/pcb.desktop.in
+ data/pcb.xml.in
+-data/x-excellon.desktop.in
+-data/x-gerber.desktop.in
+-data/x-pcb-footprint.desktop.in
+-data/x-pcb-layout.desktop.in
+-data/x-pcb-netlist.desktop.in
+ src/action.c
+ src/autoplace.c
+ src/autoroute.c

-- 
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