[Pkg-electronics-commits] [gerbv] 01/03: Convert patches to git-buildpackage format
Dr. Tobias Quathamer
toddy at debian.org
Mon Jan 16 09:05:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
toddy pushed a commit to branch master
in repository gerbv.
commit d2aadb822ee195e9b7a51e03415234dc1f2a06e3
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date: Mon Jan 16 09:30:37 2017 +0100
Convert patches to git-buildpackage format
---
debian/patches/0001-Desktop-file.patch | 20 +++++++++++++++
...{02_fix_manpage.diff => 0002-Fix-manpage.patch} | 20 +++++++++++----
debian/patches/0003-No-translation-available.patch | 29 ++++++++++++++++++++++
debian/patches/01_desktop_file.diff | 10 --------
debian/patches/03_no_translation_available.diff | 16 ------------
debian/patches/series | 6 ++---
6 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/debian/patches/0001-Desktop-file.patch b/debian/patches/0001-Desktop-file.patch
new file mode 100644
index 0000000..3a81873
--- /dev/null
+++ b/debian/patches/0001-Desktop-file.patch
@@ -0,0 +1,20 @@
+From: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
+Date: Mon, 16 Jan 2017 09:20:09 +0100
+Subject: Desktop file
+
+Removes encoding key
+---
+ desktop/gerbv.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/desktop/gerbv.desktop b/desktop/gerbv.desktop
+index a8842ba..4c58f4d 100644
+--- a/desktop/gerbv.desktop
++++ b/desktop/gerbv.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Gerbv Gerber File Viewer
+ Name[ru]= Gerbv — просмотр Gerber-файлов
+ GenericName=Gerber File Viewer
diff --git a/debian/patches/02_fix_manpage.diff b/debian/patches/0002-Fix-manpage.patch
similarity index 73%
rename from debian/patches/02_fix_manpage.diff
rename to debian/patches/0002-Fix-manpage.patch
index 88848d7..7c453de 100644
--- a/debian/patches/02_fix_manpage.diff
+++ b/debian/patches/0002-Fix-manpage.patch
@@ -1,7 +1,17 @@
+From: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
+Date: Mon, 16 Jan 2017 09:20:09 +0100
+Subject: Fix manpage
+
Fixes minor errors in man-page
+---
+ man/gerbv.1.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/man/gerbv.1.in b/man/gerbv.1.in
+index c6f8df9..e91926c 100644
--- a/man/gerbv.1.in
+++ b/man/gerbv.1.in
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ e.g. #FF0000 for Red.
Use foreground color <hex>. <hex> is specified as an html-color code,
e.g. #00FF00 for Green. If a user also wants to set the alpha (rendering
with Cairo) it can be specified as an #RRGGBBAA code. Use multiple
@@ -10,7 +20,7 @@ Fixes minor errors in man-page
.TP
.BI -l\ <filename>|--log=<filename>
All error messages etc are stored in a file with filename \fI<filename>\fP.
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ Load a stored project. Please note that the project file must be stored in
the same directory as the gerber files.
.SS gerbv Export-specific options:
@@ -19,7 +29,7 @@ Fixes minor errors in man-page
.TP
.BI -B<b>|--Border=<b>
Set the border around the image <b> percent of the width and height.
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ render engine). Use <R> to have the same resolution in both directions.
Defaults to 72 DPI in both directions.
.TP
.BI -T<X,Y>|--translate=<X,Y>
@@ -28,7 +38,7 @@ Fixes minor errors in man-page
multiple files.
.TP
.BI -O<XxY>|--origin=<XxY>
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ way to create a project is to load all files you want into the layer
you want, set all the colors etc and do a "Save Project As...".
You load a project either from the menu bar or by using the commandline
@@ -37,7 +47,7 @@ Fixes minor errors in man-page
Currently there is a limit in that the project file must be in the same
directory as the gerber files to be loaded.
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ A standard practice with Eagle is to create an empty Tools file, run the
CAM processor, and the error report tells you which tools you "forgot".
Then you put these tools into the file and rerun the CAM processor.
diff --git a/debian/patches/0003-No-translation-available.patch b/debian/patches/0003-No-translation-available.patch
new file mode 100644
index 0000000..6ba8014
--- /dev/null
+++ b/debian/patches/0003-No-translation-available.patch
@@ -0,0 +1,29 @@
+From: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
+Date: Mon, 16 Jan 2017 09:20:09 +0100
+Subject: No translation available
+
+---
+ man/Makefile.am | 2 +-
+ po/LINGUAS | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 4870e71..d906acd 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -19,7 +19,7 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+
+-man_MANS = gerbv.1 gerbv.ru.1
++man_MANS = gerbv.1
+ PO_FILES= gerbv.ru.1.in.po
+
+ MOSTLYCLEANFILES = *~
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 562ba4c..8b13789 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-ru
++
diff --git a/debian/patches/01_desktop_file.diff b/debian/patches/01_desktop_file.diff
deleted file mode 100644
index d705cc6..0000000
--- a/debian/patches/01_desktop_file.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-Removes encoding key
---- a/desktop/gerbv.desktop
-+++ b/desktop/gerbv.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Gerbv Gerber File Viewer
- Name[ru]= Gerbv — просмотр Gerber-файлов
- GenericName=Gerber File Viewer
diff --git a/debian/patches/03_no_translation_available.diff b/debian/patches/03_no_translation_available.diff
deleted file mode 100644
index 74bdd84..0000000
--- a/debian/patches/03_no_translation_available.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1 +1 @@
--ru
-+
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -19,7 +19,7 @@
- ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
-
--man_MANS = gerbv.1 gerbv.ru.1
-+man_MANS = gerbv.1
- PO_FILES= gerbv.ru.1.in.po
-
- MOSTLYCLEANFILES = *~
diff --git a/debian/patches/series b/debian/patches/series
index af456f9..cf70794 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01_desktop_file.diff
-02_fix_manpage.diff
-03_no_translation_available.diff
+0001-Desktop-file.patch
+0002-Fix-manpage.patch
+0003-No-translation-available.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gerbv.git
More information about the Pkg-electronics-commits
mailing list