[iausofa] 02/02: Update debian files for new version

Mon Jan 6 13:57:08 UTC 2014

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository iausofa.

commit dc4871eb7c2b8040f3164ec080d4d6a6ac14617e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jan 6 14:57:06 2014 +0100

    Update debian files for new version
---
 debian/changelog                           |  9 ++++++++
 debian/control                             | 12 +++++------
 debian/patches/create_shared_lib.patch     | 34 +++++++++++++-----------------
 debian/patches/propagate_buildflags.patch  |  6 +++---
 debian/patches/set_installation_path.patch | 17 ++++-----------
 debian/rules                               |  2 +-
 6 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 347c31c..eb45d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+iausofa-c (2013.12.02-1) unstable; urgency=low
+
+  * New upstream version
+  * Change to non-free because of name-change clause 3c. Use erfa as
+    DFSG compliant replacement
+  * Update Standards-Version to 3.9.5; remove DMUA flag.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 06 Jan 2014 14:20:43 +0100
+
 iausofa-c (2012.03.01.a-1~exp1) experimental; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 2b6a747..4d01946 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
 Source: iausofa-c
-Section: science
+Section: non-free/science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://www.iausofa.org/index.html
-Vcs-Git: git://git.debian.org/git/debian-science/packages/iausofa.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/iausofa.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/iausofa.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/iausofa.git
 
 Package: libsofa-c0
-Section: libs
+Section: non-free/libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -39,7 +39,7 @@ Description: Algorithms for models in fundamental astronomy (shared library)
  This package contains the shared library.
 
 Package: libsofa-c-dev
-Section: libdevel
+Section: non-free/libdevel
 Architecture: any
 Depends: libsofa-c0 (= ${binary:Version}), ${misc:Depends}
 Description: Algorithms for models in fundamental astronomy (development files)
diff --git a/debian/patches/create_shared_lib.patch b/debian/patches/create_shared_lib.patch
index 6067732..62cc3d7 100644
--- a/debian/patches/create_shared_lib.patch
+++ b/debian/patches/create_shared_lib.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Create a shared library
---- a/20120301_a/c/src/makefile
-+++ b/20120301_a/c/src/makefile
+--- a/20131202/c/src/makefile
++++ b/20131202/c/src/makefile
 @@ -64,7 +64,7 @@
  # for functions, CFLAGX for executables) here.
  
@@ -23,7 +23,7 @@ Description: Create a shared library
  # Name the SOFA/C testbed in its source and target locations.
  
  SOFA_TEST_NAME = t_sofa_c.c
-@@ -292,18 +297,21 @@
+@@ -326,18 +331,21 @@
  	-@ echo ""
  
  # Install the library and header files.
@@ -35,34 +35,30 @@ Description: Create a shared library
 +	ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB)
  
  # Deinstall the library and header files.
- deinstall:
--	rm -f $(SOFA_LIB) $(SOFA_INC)
-+	rm -f $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC)
+ uninstall:
+-	- $(RM) $(SOFA_LIB) $(SOFA_INC)
++	- $(RM) $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC)
  
  # Test the build.
- check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
+-check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
++check_disabled: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
  	$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_LIB_NAME) \
          -lm -o $(SOFA_TEST)
 -	./$(SOFA_TEST)
 +	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SOFA_LIB_DIR) ./$(SOFA_TEST)
- 	rm -f $(SOFA_TEST)
  
  # Test the installed library.
-@@ -315,11 +323,11 @@
+ installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
+@@ -351,7 +359,7 @@
  
- # Local clean up.
- clean realclean:
--	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME)
-+	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)
- 
- # Clean up and deinstall.
- distclean:
--	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME)
-+	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)*
+ # Delete all generated binaries in the current directory.
+ realclean distclean : clean
+-	- $(RM) $(SOFA_LIB_NAME) $(SOFA_TEST)
++	- $(RM) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)* $(SOFA_TEST)
  
  # Create the installation directories if not already present.
  $(INSTALL_DIRS):
-@@ -329,6 +337,9 @@
+@@ -361,6 +369,9 @@
  $(SOFA_LIB_NAME): $(SOFA_OBS)
  	ar ru $(SOFA_LIB_NAME) $?
  
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index b45612a..b5611d4 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Propagate CFLAGS and CPPFLAGS to the build system
---- a/20120301_a/c/src/makefile
-+++ b/20120301_a/c/src/makefile
+--- a/20131202/c/src/makefile
++++ b/20131202/c/src/makefile
 @@ -64,8 +64,8 @@
  # for functions, CFLAGX for executables) here.
  
@@ -13,7 +13,7 @@ Description: Propagate CFLAGS and CPPFLAGS to the build system
  
  #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
  
-@@ -338,7 +338,7 @@
+@@ -370,7 +370,7 @@
  	ar ru $(SOFA_LIB_NAME) $?
  
  $(SOFA_SHLIB_NAME): $(SOFA_OBS)
diff --git a/debian/patches/set_installation_path.patch b/debian/patches/set_installation_path.patch
index 5e20ef8..448e51b 100644
--- a/debian/patches/set_installation_path.patch
+++ b/debian/patches/set_installation_path.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Set the installation path according to the FHS. Also, remove the
  "test" target alias (use installcheck instead).
---- a/20120301_a/c/src/makefile
-+++ b/20120301_a/c/src/makefile
+--- a/20131202/c/src/makefile
++++ b/20131202/c/src/makefile
 @@ -49,11 +49,11 @@
  
  # Specify the installation home directory.
@@ -17,8 +17,8 @@ Description: Set the installation path according to the FHS. Also, remove the
  
  # Specify the installation directory for the include files.
  
-@@ -307,7 +307,7 @@
- 	rm -f $(SOFA_TEST)
+@@ -340,7 +340,7 @@
+ 	./$(SOFA_TEST)
  
  # Test the installed library.
 -installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
@@ -26,12 +26,3 @@ Description: Set the installation path according to the FHS. Also, remove the
  	$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \
          -L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST)
  	./$(SOFA_TEST)
-@@ -319,7 +319,7 @@
- 
- # Clean up and deinstall.
- distclean:
--	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB)
-+	rm -f $(SOFA_OBS) $(SOFA_LIB_NAME)
- 
- # Create the installation directories if not already present.
- $(INSTALL_DIRS):
diff --git a/debian/rules b/debian/rules
index 18ea3a9..d5d11cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ -D20120301_a/c/src 
+	dh $@ -D20131202/c/src 
 
 override_dh_installchangelogs:
 	dh_installchangelogs */c/doc/changes.lis

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/iausofa.git

