[Pkg-electronics-commits] [SCM] Packaging for Gerbv branch, master, updated. debian/2.4.0-1-3-g44c2ee0
Gudjon I. Gudjonsson
gudjon at gudjon.org
Sun Mar 20 15:46:55 UTC 2011
The following commit has been merged in the master branch:
commit 44c2ee035fa0cdf0edf252534fb5a9337bfe9566
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Sun Mar 20 16:44:31 2011 +0100
* New upstream release
* Bump standards version to 3.9.1
* Add git and homepage fields to control file
* Switch to dpkg-source 3.0 (quilt) format
* Rewrote both patches in quilt format
* Add patch 03_fix_ftbfs_binutils-gold.diff (Closes: #554484)
deleted: debian/README.source
modified: debian/changelog
modified: debian/control
modified: debian/gerbv.lintian-overrides
new file: debian/patches/01_desktop_file.diff
new file: debian/patches/02_fix_manpage.diff
new file: debian/patches/03_fix_ftbfs_binutils-gold.diff
new file: debian/patches/series
modified: debian/rules
new file: debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 399da22..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-The buildsystem uses dpatch to add a few minor patches to the program.
-
diff --git a/debian/changelog b/debian/changelog
index dc2efef..44c3a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gerbv (2.5.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump standards version to 3.9.1
+ * Add git and homepage fields to control file
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Rewrote both patches in quilt format
+ * Add patch 03_fix_ftbfs_binutils-gold.diff (Closes: #554484)
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Tue, 01 Feb 2011 09:48:32 +0100
+
gerbv (2.4.0-1) unstable; urgency=low
[ Gudjon I. Gudjonsson ]
diff --git a/debian/control b/debian/control
index 8c2eb61..00bcf29 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,17 @@ Section: electronics
Priority: optional
Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
Uploaders: Hamish Moffatt <hamish at debian.org>, Wesley J. Landaker <wjl at icecavern.net>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>, Gudjon I. Gudjonsson <gudjon at gudjon.org>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7), libgtk2.0-dev, libglib2.0-dev, libpng12-dev, libcairo2-dev, dpatch, autotools-dev
-Homepage: http://gerbv.sourceforge.net/
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), libgtk2.0-dev, libglib2.0-dev, libpng12-dev, libcairo2-dev, autotools-dev
+Homepage: http://gerbv.gpleda.org/
+Vcs-Git: git://git.debian.org/pkg-electronics/gerbv.git
+Vcs-Browser: http://git.debian.org/?p=pkg-electronics/gerbv.git
Package: gerbv
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: extra-xdg-menus
Description: Gerber file viewer for PCB design
- gerbv is a utility for viewing Gerber files. Gerber files are used
- for communicating printed circuit board (PCB) designs to PCB manufacturers.
+ gerbv is a utility for viewing Gerber RS-274X files, Excellon drill files,
+ and CSV pick-and-place files. Gerber files are used for communicating
+ printed circuit board (PCB) designs to PCB manufacturers.
diff --git a/debian/gerbv.lintian-overrides b/debian/gerbv.lintian-overrides
index 8e5afdc..c816880 100644
--- a/debian/gerbv.lintian-overrides
+++ b/debian/gerbv.lintian-overrides
@@ -1,2 +1,2 @@
gerbv: package-name-doesnt-match-sonames libgerbv1
-gerbv: non-dev-pkg-with-shlib-symlink usr/lib/libgerbv.so.1.0.5 usr/lib/libgerbv.so
+#gerbv: non-dev-pkg-with-shlib-symlink usr/lib/libgerbv.so.1.0.5 usr/lib/libgerbv.so
diff --git a/debian/patches/01_desktop_file.diff b/debian/patches/01_desktop_file.diff
new file mode 100644
index 0000000..4bae93a
--- /dev/null
+++ b/debian/patches/01_desktop_file.diff
@@ -0,0 +1,10 @@
+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
+ GenericName=Gerber File Viewer
+ Comment=Gerber file viewer for PCB design
diff --git a/debian/patches/02_fix_manpage.diff b/debian/patches/02_fix_manpage.diff
new file mode 100644
index 0000000..f0e382a
--- /dev/null
+++ b/debian/patches/02_fix_manpage.diff
@@ -0,0 +1,48 @@
+Fixes minor errors in man-page
+--- a/man/gerbv.1.in
++++ b/man/gerbv.1.in
+@@ -32,7 +32,7 @@
+ 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
+--f flags to set the color for multiple layers.
++\-f flags to set the color for multiple layers.
+ .TP
+ .BI -l\ <filename>|--log=<filename>
+ All error messages etc are stored in a file with filename \fI<filename>\fP.
+@@ -45,7 +45,7 @@
+ the same directory as the gerber files.
+
+ .SS gerbv Export-specific options:
+-The following commands can be used in combination with the -x flag:
++The following commands can be used in combination with the \-x flag:
+ .BI -B<b>|--Border=<b>
+ Set the border around the image <b> percent of the width and height.
+ Default <b> is 5%%.
+@@ -57,7 +57,7 @@
+ Defaults to 72 DPI in both directions.
+ .TP
+ .BI -T<X,Y>|--translate=<X,Y>
+-Translate the image by the distance <X,Y>. Use multiple -T flags to translate
++Translate the image by the distance <X,Y>. Use multiple \-T flags to translate
+ multiple files.
+ .TP
+ .BI -O<XxY>|--origin=<XxY>
+@@ -185,7 +185,7 @@
+ 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
+-switches -p or --project.
++switches \-p or \-\-project.
+
+ Currently there is a limit in that the project file must be in the same
+ directory as the gerber files to be loaded.
+@@ -219,7 +219,7 @@
+ 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.
+
+-You load a tool file by using the commandline switches -t or --tools.
++You load a tool file by using the commandline switches \-t or \-\-tools.
+ The file can have any name you wish, but Eagle expects the file type to
+ be ".drl", so it makes sense to keep it this way. Some board houses are
+ still using CAM software from DOS era, so you may want to excercise caution
diff --git a/debian/patches/03_fix_ftbfs_binutils-gold.diff b/debian/patches/03_fix_ftbfs_binutils-gold.diff
new file mode 100644
index 0000000..a68dbc9
--- /dev/null
+++ b/debian/patches/03_fix_ftbfs_binutils-gold.diff
@@ -0,0 +1,24 @@
+Fixes build with binutils-gold. Patch is based on
+Mahyuddin Susanto <udienz at gmail.com> Ubuntu patch
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -89,7 +89,7 @@
+ interface.h render.c render.h \
+ icons.h
+
+-gerbv_LDADD = libgerbv.la
++gerbv_LDADD = libgerbv.la -ldl
+ gerbv_DEPENDENCIES = libgerbv.la
+
+ # If we are building on win32, then compile in some icons for the
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -284,7 +284,7 @@
+ interface.h render.c render.h \
+ icons.h
+
+-gerbv_LDADD = libgerbv.la $(am__append_1)
++gerbv_LDADD = libgerbv.la $(am__append_1) -ldl
+ gerbv_DEPENDENCIES = libgerbv.la $(am__append_2)
+ TXT2CL = sed -e 's;%;%%;g' -e 's;\\;\\\\;g' -e 's;";\\";g' -e 's;^;";g' -e 's;$$;",;g'
+ CLEANFILES = authors.c bugs.c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c36cfec
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_desktop_file.diff
+02_fix_manpage.diff
+03_fix_ftbfs_binutils-gold.diff
diff --git a/debian/rules b/debian/rules
index 9bc89cf..a24541e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
-config.status: patch configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
@@ -21,7 +19,7 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Packaging for Gerbv
More information about the Pkg-electronics-commits
mailing list