[Git][java-team/snappy-java][master] 6 commits: Drop content of NOTICE file from d/copyright and add the file separately

Thu May 3 08:05:35 BST 2018

Andreas Tille pushed to branch master at Debian Java Maintainers / snappy-java


Commits:
27a08f48 by Andreas Tille at 2018-05-03T08:32:09+02:00
Drop content of NOTICE file from d/copyright and add the file separately

- - - - -
6d731980 by Andreas Tille at 2018-05-03T08:32:51+02:00
Drop get-orig-source target

- - - - -
0b29ba85 by Andreas Tille at 2018-05-03T08:34:08+02:00
Do not set DEB_HOST_MULTIARCH

- - - - -
fc1f70c4 by Andreas Tille at 2018-05-03T08:35:47+02:00
Do not parse d/changelog

- - - - -
dfb6f6bf by Andreas Tille at 2018-05-03T08:38:03+02:00
hardening=+all

- - - - -
5fcb52a4 by Andreas Tille at 2018-05-03T09:05:23+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- + debian/docs
- debian/rules


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-snappy-java (1.1.7.1+dfsg-1) UNRELEASED; urgency=medium
+snappy-java (1.1.7.1+dfsg-1) unstable; urgency=medium
 
   * Turn exclusions of orig-tar.sh into Files-Excluded
   * New upstream version
@@ -6,8 +6,15 @@ snappy-java (1.1.7.1+dfsg-1) UNRELEASED; urgency=medium
   * Standards-Version: 4.1.4
   * Build-Depends: maven-debian-helper
   * Point Vcs-fields to Salsa
-
- -- Andreas Tille <tille at debian.org>  Wed, 02 May 2018 22:15:24 +0200
+  * Drop content of NOTICE file from d/copyright and add the file
+    separately
+  * d/rules:
+     - Drop get-orig-source target
+     - Do not set DEB_HOST_MULTIARCH
+     - Do not parse d/changelog
+     - hardening=+all
+
+ -- Andreas Tille <tille at debian.org>  Thu, 03 May 2018 08:38:10 +0200
 
 snappy-java (1.1.4-1) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://github.com/xerial/snappy-java
 Comment: lib/silk-weaver.jar is not packaged in Debian, and the other files in
  this directory are not useful to the Debian package, so they were removed.
@@ -15,6 +15,13 @@ Files: *
 Copyright: 2008-2011, Taro L. Saito
            2011-2016, xerial.org
 License: Apache-2.0
+
+Files: debian/*
+Copyright: 2012 Charles Plessy <plessy at debian.org>
+           2012-2018 Andreas Tille <tille at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -29,17 +36,3 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache License version 2.0
  can be found in ‘/usr/share/common-licenses/Apache-2.0’.
-Comment:
- This product includes software developed by Google
-   Snappy: http://code.google.com/p/snappy/ (New BSD License)
- .
- .
- This library containd statically linked libstdc++. This inclusion is allowed by
- "GCC RUntime Library Exception"
- http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html
- .
- == Contributors ==
-   * Tatu Saloranta
-     * Providing benchmark suite
-   * Alec Wysoker
-     * Performance and memory usage improvement


=====================================
debian/docs
=====================================
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+NOTICE


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME := /usr/lib/jvm/default-java
-DEB_HOST_MULTIARCH   = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
 DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/default.mk
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@ --buildsystem=maven
 
 override_dh_auto_configure:
-	sed -e 's/%VERSION%/$(DEB_UPSTREAM_VERSION)/g' debian/pom.xml > pom.xml
+	sed -e 's/%VERSION%/$(DEB_VERSION_UPSTREAM)/g' debian/pom.xml > pom.xml
 	dh_auto_configure
 
 override_dh_auto_build-arch:
@@ -36,6 +36,3 @@ override_dh_auto_install-arch:
 override_dh_auto_clean:
 	-dh_auto_clean
 	rm -f pom.xml
-
-get-orig-source:
-	uscan --download-current-version --rename --force-download



View it on GitLab: https://salsa.debian.org/java-team/snappy-java/compare/b59048d4cfdce382d25ac673075c9b6692b65bda...5fcb52a43005750d1083d1aaedeb5e855a6cc365

---
View it on GitLab: https://salsa.debian.org/java-team/snappy-java/compare/b59048d4cfdce382d25ac673075c9b6692b65bda...5fcb52a43005750d1083d1aaedeb5e855a6cc365
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-java-commits/attachments/20180503/7fd1f08c/attachment.html>
