[freeside-commits] branch master updated. 6f94e176aa7b143eb9f1fa5c3a1cdd362361636f

[Ivan]

The branch, master has been updated
       via  6f94e176aa7b143eb9f1fa5c3a1cdd362361636f (commit)
       via  2f0ad153c1481f9fbe257834319919008c45a275 (commit)
       via  3e47da3b954d463c36d4d446a37e0b7c67b3c16f (commit)
      from  3e46323fb8c43b5a226251299a993befc896b71f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f94e176aa7b143eb9f1fa5c3a1cdd362361636f
Merge: 2f0ad15 3e46323
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Sep 12 17:12:03 2017 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 2f0ad153c1481f9fbe257834319919008c45a275
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Sep 12 17:11:04 2017 -0700

    current census year selection

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6280487..6a02b0b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4488,7 +4488,7 @@ and customer address. Include units.',
     'section'     => 'addresses',
     'description' => 'The year to use in census tract lookups.  NOTE: you need to select 2012 or 2013 for Year 2010 Census tract codes.  A selection of 2011 provides Year 2000 Census tract codes.  Use the freeside-censustract-update tool if exisitng customers need to be changed.',
     'type'        => 'select',
-    'select_enum' => [ qw( 2013 2012 2011 ) ],
+    'select_enum' => [ qw( 2017 2016 2015 ) ],
   },
 
   {

commit 3e47da3b954d463c36d4d446a37e0b7c67b3c16f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Sep 12 17:09:42 2017 -0700

    no longer supporting deb7 in new builds

diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index c774dd8..7b95bb6 100755
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -31,13 +31,6 @@ git checkout -- debian/changelog
 git pull
 #STATUS=`git pull`
 
-#Assign the proper config files for freeside-ng-selfservice
-if [ $DISTRO = "wheezy" ]; then
-	ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb7 $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-else
-	ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb8 $DIR/freeside/debian/freeside-ng-selfservice.conffiles
-fi
-
 # Add the build information to changelog
 if [ $FS_REPO != "stable" ]; then
 	dch -b --newversion $GIT_VERSION-$DATE "Auto-Build"
diff --git a/debian/freeside-ng-selfservice.deb8 b/debian/freeside-ng-selfservice.conffiles
similarity index 100%
rename from debian/freeside-ng-selfservice.deb8
rename to debian/freeside-ng-selfservice.conffiles
diff --git a/debian/freeside-ng-selfservice.deb7 b/debian/freeside-ng-selfservice.deb7
deleted file mode 100644
index 58f0d3a..0000000
--- a/debian/freeside-ng-selfservice.deb7
+++ /dev/null
@@ -1 +0,0 @@
-/var/www/ng_selfservice-DIST/freeside.class.php

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm                                                   |    2 +-
 bin/freeside-debian-releases.sh                                 |    7 -------
 ...de-ng-selfservice.deb8 => freeside-ng-selfservice.conffiles} |    0
 debian/freeside-ng-selfservice.deb7                             |    1 -
 4 files changed, 1 insertion(+), 9 deletions(-)
 rename debian/{freeside-ng-selfservice.deb8 => freeside-ng-selfservice.conffiles} (100%)
 delete mode 100644 debian/freeside-ng-selfservice.deb7