[Git][debian-gis-team/unarr][master] 11 commits: debian: copyright: Fix bad paths, relicense debian/ as GPL-2+.

Alec leamas gitlab at salsa.debian.org
Sun Sep 2 16:21:06 BST 2018 

Alec leamas pushed to branch master at Debian GIS Project / unarr


Commits:
c2e0dea1 by Alec Leamas at 2018-09-02T15:18:26Z
debian: copyright: Fix bad paths, relicense debian/ as GPL-2+.

- - - - -
71b2fcb6 by Alec Leamas at 2018-09-02T15:19:23Z
debian: copyright: Update, add licenses text.

- - - - -
1824dc1b by Alec Leamas at 2018-09-02T15:19:23Z
debian: changelog: Fix bad ITP reference.

- - - - -
267c7595 by Alec Leamas at 2018-09-02T15:19:23Z
debian: changelog: Use a sortable date.

- - - - -
39e9e6a6 by Alec Leamas at 2018-09-02T15:19:23Z
debian: Use compat level 9.

To retain compatibilty with Ubuntu LTS branches, stay on level 9.

- - - - -
56cf6d23 by Alec Leamas at 2018-09-02T15:19:23Z
debian: control: Reorganize w cme, bugfixes, descriptions update.

- - - - -
5f13bb07 by Alec Leamas at 2018-09-02T15:19:23Z
debian: Add README.source, info on get-orig-source.

- - - - -
942919fd by Alec Leamas at 2018-09-02T15:19:23Z
debian: rules: Don't mess w dpkg-parsechangelog.

- - - - -
aa036324 by Alec Leamas at 2018-09-02T15:19:23Z
debian: rules: Don't override unless necessary.

- - - - -
4785b410 by Alec Leamas at 2018-09-02T15:19:23Z
debian: Add a .gitignore.

- - - - -
99ad426f by Alec Leamas at 2018-09-02T15:19:23Z
debian: Update patches.

- - - - -


12 changed files:

- + debian/.gitignore
- + debian/README.source
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/docs
- debian/patches/0001-Add-a-gitignore.patch → debian/patches/0001-Build-Add-a-.gitignore.patch
- debian/patches/0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch
- + debian/patches/0003-Build-fix-as-needed-madness.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/.gitignore
=====================================
@@ -0,0 +1,8 @@
+.debhelper
+*.log
+*.substvars
+debhelper-build-stamp
+files
+tmp
+unarr-dev
+unarr1


=====================================
debian/README.source
=====================================
@@ -0,0 +1,10 @@
+The unarr project does not have any git tags defined at the time 
+of writing. As a result, uscan cannot download unarr sources.
+
+As a walk-around, this package implements the traditional target
+get-orig-source to create the source orig tarball. Besides 
+downloading, the target also handles upstream's DOS line endings.
+
+The target is usually invoked as 'fakeroot debian/rules get-orig-source'.
+
+


=====================================
debian/changelog
=====================================
@@ -1,5 +1,5 @@
-unarr (20150801.d1be8c43-1) unstable; urgency=medium
+unarr (0~20150801.d1be8c43-1) unstable; urgency=medium
 
-  * Initial release (Closes: #123456) 
+  * Initial release (Closes: #907070)
 
- -- Alec Leamas <leamas.alec at gmail.com>  Wed, 22 Aug 2018 09:27:31 -0400
+ -- Alec Leamas <leamas.alec at gmail.com>  Sun, 02 Sep 2018 00:44:03 -0400


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+9


=====================================
debian/control
=====================================
@@ -1,21 +1,24 @@
 Source: unarr
+Maintainer: Debian GIS group <debian-gis at lists.debian.org>
+Uploaders: Alec Leamas <leamas.alec at googlemail.com>
+Section: misc
 Priority: optional
-Maintainer: Alec Leamas <leamas.alec at gmail.com>
 Build-Depends: debhelper (>= 11),
- zlib1g-dev,
- libbz2-dev
-Standards-Version: 4.1.3
-Section: libs
-Homepage:https://github.com/zeniko/unarr
-Vcs-Browser: https://github.com/zeniko/unarr
-Vcs-Git: https://github.com/zeniko/unarr.git
+               cmake,
+               libbz2-dev,
+               zlib1g-dev
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/unarr§
+Vcs-Git: https://salsa.debian.org/debian-gis-team/unarr.git
+Homepage: https://github.com/zeniko/unarr
 
 Package: unarr-dev
-Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: unarr1 (= ${binary:Version}), ${misc:Depends}
-Description: Decompression library for RAR, TAR, ZIP and 7z archives
+Section: libdevel
+Depends: unarr1 (= ${binary:Version}),
+         ${misc:Depends}
+Description: Decompression library for RAR, TAR, ZIP and 7z archives (runtime)
  Development tools: headers and unversioned libraries
  .
  See unarr1 for more info.
@@ -23,8 +26,9 @@ Description: Decompression library for RAR, TAR, ZIP and 7z archives
 Package: unarr1
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Decompression library for RAR, TAR, ZIP and 7z archives
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Decompression library for RAR, TAR, ZIP and 7z archives (dev)
  unarr originated as a port of the RAR extraction features from
  The Unarchiver project required for extracting images from comic
  book archives (.cbr). It was written as an alternative to


=====================================
debian/copyright
=====================================
@@ -29,22 +29,30 @@ Copyright:Simon Bünzli (zeniko at gmail.com, http://www.zeniko.ch/#SumatraPDF)
 License: LGPL-3
 
 Files: debian/*
-Copyright: 2018 Alec Leamas <leamas at nowhere.net>
-License: LGPL-3
+Copyright: 2018 Alec Leamas  <leamas.alec at gmail.com>
+License: GPL-2+
 
 License: LGPL-3
  This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+ it under the terms of the GNU Lesser General Public License  version
+ 3 as published by the Free Software Foundation
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  GNU Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 3 can be found in "/usr/share/common-licenses/LGPL-3".
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+ Otherwise, refer to the online version at GNU website
+ `https://gnu.org/licenses/old-licenses/gpl-1.0.txt`.


=====================================
debian/docs
=====================================
@@ -0,0 +1 @@
+debian/README.source


=====================================
debian/patches/0001-Add-a-gitignore.patch → debian/patches/0001-Build-Add-a-.gitignore.patch
=====================================
@@ -1,7 +1,6 @@
-From 63c1431a7f89229bf6586ba5954ac45ef2813720 Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas.alec at nowhere.net>
-Date: Wed, 22 Aug 2018 09:20:23 -0400
-Subject: [PATCH 1/2] Add a gitignore
+Date: Sun, 2 Sep 2018 06:20:25 -0400
+Subject: Build: Add a .gitignore.
 
 ---
  .gitignore | 5 +++++
@@ -10,15 +9,12 @@ Subject: [PATCH 1/2] Add a gitignore
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
-index 0000000..f8501d8
+index 0000000..f505019
 --- /dev/null
 +++ b/.gitignore
 @@ -0,0 +1,5 @@
 +*.o
 +*.so
 +build
-+*substvars
++obj-*
 +
--- 
-2.18.0
-


=====================================
debian/patches/0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch
=====================================
@@ -1,12 +1,16 @@
-From 2ed5ae953a63d9e8ee0981335b456933ea324565 Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas.alec at nowhere.net>
 Date: Wed, 22 Aug 2018 09:22:01 -0400
-Subject: [PATCH 2/2] build: Add Cmake files from
- https://github.com/selmf/unarr.
+Subject: build: Add Cmake files from https://github.com/selmf/unarr.
+
+Origin: https://github.com/selmf/unarr
+
+Add a CMakelists.txt and pkg-config .pc file from said upstream, a more
+elaborated version of the original sources.  Submitted to upstream as
+https://github.com/zeniko/unarr/issues/9.
 
 ---
- CMakeLists.txt      | 178 ++++++++++++++++++++++++++++++++++++++++++++
- pkg-config.pc.cmake |  11 +++
+ CMakeLists.txt      | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ pkg-config.pc.cmake |  11 ++++
  2 files changed, 189 insertions(+)
  create mode 100644 CMakeLists.txt
  create mode 100644 pkg-config.pc.cmake
@@ -212,6 +216,3 @@ index 0000000..ada86f1
 +Requires.private: @PROJECT_REQUIRES_PRIVATE@
 +Libs: -L${libdir} -l at PROJECT_NAME@
 +Libs.private: @PROJECT_LIBS_PRIVATE@
--- 
-2.18.0
-


=====================================
debian/patches/0003-Build-fix-as-needed-madness.patch
=====================================
@@ -0,0 +1,32 @@
+From: Alec Leamas <leamas.alec at nowhere.net>
+Date: Sun, 2 Sep 2018 10:40:02 -0400
+Subject: Build: fix as-needed madness.
+
+---
+For gcc, the --as-needed linker flags must come after object files, before 
+the libraries. If given as first flag, the library is linked as an 
+application. If given after the libraries, it's useless.
+
+A proper patch to the cmake build system seems really hard. For now,
+disabling as-needed completely leading to some useless runtime linkage.
+
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4babfe..f76b642 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,9 +150,9 @@ if(UNIX OR MINGW OR MSYS)
+   elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
+     set_target_properties(unarr PROPERTIES LINK_FLAGS
+                           "-Wl,-undefined,error -flto")
+-  else()
+-    set_target_properties(unarr PROPERTIES LINK_FLAGS
+-                          "-Wl,--no-undefined -Wl,--as-needed")
++#  else()
++#    set_target_properties(unarr PROPERTIES LINK_FLAGS
++#                          "-Wl,--no-undefined -Wl,--as-needed")
+   endif()
+ endif()
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
-0001-Add-a-gitignore.patch
+0001-Build-Add-a-.gitignore.patch
 0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch
+0003-Build-fix-as-needed-madness.patch


=====================================
debian/rules
=====================================
@@ -1,32 +1,25 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 %:
-	dh $@
+	dh $@  --buildsystem cmake --parallel
 
 override_dh_auto_clean:
 	dh_clean
-	rm -rf build
-
-override_dh_auto_configure:
-	test -d build || mkdir build
-	cd build; cmake  \
-	    -DCMAKE_VERBOSE_MAKEFILE=ON \
-	    -DCMAKE_INSTALL_PREFIX=/usr \
-	    -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-	    ..
+	rm -rf obj-*
 
-override_dh_auto_install:
-	cd build; DESTDIR=../debian/tmp make install
+override_dh_auto_test:
+	echo "No tests available."
 
-# Walk around what looks like a tar bug, see 
+# Walk around what looks like a tar bug, see
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831870
 # While we are on it, fix upstream dos line endings.
-VERSION      = $(shell dpkg-parsechangelog --show-field=Version)
-VERSION      := $(word 1, $(subst -, ,$(VERSION)))
+VERSION      = $(DEB_VERSION_UPSTREAM)
 COMMIT       = $(word 2, $(subst ., , $(VERSION)))
 
 get-orig-source:
-	wget https://github.com/zeniko/unarr/archive/$(COMMIT)/unarr-$(VERSION).tar.gz 
+	wget https://github.com/zeniko/unarr/archive/$(COMMIT)/unarr-$(VERSION).tar.gz
 	test -d utmp || mkdir utmp; rm -rf utmp/*
 	mv unarr-$(VERSION).tar.gz utmp
 	cd utmp; tar xaf unarr-$(VERSION).tar.gz; mv unarr-$(COMMIT)* unarr-$(COMMIT)



View it on GitLab: https://salsa.debian.org/debian-gis-team/unarr/compare/812e30a4801dc1fb3ff0fa1b627875795aa247e6...99ad426f9993df492d0ae05600be1987deb31871

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/unarr/compare/812e30a4801dc1fb3ff0fa1b627875795aa247e6...99ad426f9993df492d0ae05600be1987deb31871
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180902/4471496b/attachment-0001.html>

More information about the Pkg-grass-devel mailing list